Skip to content

Commit 140cc4b

Browse files
authored
Merge branch 'apache:main' into gru_onnx
2 parents 79bbf5f + c547bbb commit 140cc4b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1130
-341
lines changed

CMakeLists.txt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -638,18 +638,6 @@ if(BUILD_FOR_HEXAGON AND DEFINED USE_HEXAGON_GTEST AND EXISTS ${USE_HEXAGON_GTES
638638
include_directories("${USE_HEXAGON_GTEST}/include")
639639
endif()
640640

641-
if(USE_OPENCL AND DEFINED USE_OPENCL_GTEST AND EXISTS ${USE_OPENCL_GTEST})
642-
include(FetchContent)
643-
FetchContent_Declare(googletest SOURCE_DIR "${USE_OPENCL_GTEST}")
644-
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
645-
FetchContent_MakeAvailable(googletest)
646-
target_link_libraries(tvm_runtime PUBLIC gtest)
647-
target_link_libraries(tvm PUBLIC gtest)
648-
include_directories("${USE_OPENCL_GTEST}/include")
649-
include_directories("${USE_OPENCL_GTEST}/googletest/include")
650-
message(STATUS "Found OpenCL gtest at ${USE_OPENCL_GTEST}")
651-
endif()
652-
653641
# Set flags for clang
654642
include(cmake/modules/ClangFlags.cmake)
655643
set(CRC16_INCLUDE_PATH "3rdparty/libcrc/include")
@@ -715,9 +703,6 @@ install(TARGETS tvm_runtime EXPORT ${PROJECT_NAME}Targets DESTINATION lib${LIB_S
715703
if(BUILD_FOR_HEXAGON AND DEFINED USE_HEXAGON_GTEST AND EXISTS ${USE_HEXAGON_GTEST})
716704
install(TARGETS gtest EXPORT ${PROJECT_NAME}Targets DESTINATION lib${LIB_SUFFIX})
717705
endif()
718-
if(USE_OPENCL AND DEFINED USE_OPENCL_GTEST AND EXISTS ${USE_OPENCL_GTEST})
719-
install(TARGETS gtest EXPORT ${PROJECT_NAME}Targets DESTINATION lib${LIB_SUFFIX})
720-
endif()
721706

722707
if (INSTALL_DEV)
723708
install(

ci/jenkins/docker-images.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
ci_arm: tlcpack/ci-arm:20221013-060115-61c9742ea
2121
ci_cortexm: tlcpack/ci-cortexm:20221013-060115-61c9742ea
2222
ci_cpu: tlcpack/ci-cpu:20221013-060115-61c9742ea
23-
ci_gpu: tlcpack/ci-gpu:20221019-060125-0b4836739
23+
ci_gpu: tlcpack/ci-gpu:20221128-070141-ae4fd7df7
2424
ci_hexagon: tlcpack/ci-hexagon:20221013-060115-61c9742ea
2525
ci_i386: tlcpack/ci-i386:20221013-060115-61c9742ea
2626
ci_lint: tlcpack/ci-lint:20221013-060115-61c9742ea

ci/jenkins/generated/arm_jenkinsfile.groovy

Lines changed: 43 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/jenkins/generated/cortexm_jenkinsfile.groovy

Lines changed: 43 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/jenkins/generated/cpu_jenkinsfile.groovy

Lines changed: 43 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/jenkins/generated/docker_jenkinsfile.groovy

Lines changed: 43 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)