Skip to content

Commit c9b4589

Browse files
committed
Merge branch 'main' into aluo/support-negative-indices
* main: (80 commits) Introduce centralised name transformation functions (apache#9088) [OpenCL] Add vectorization to cuda conv2d_nhwc schedule (apache#8636) [6/6] Arm(R) Ethos(TM)-U NPU codegen integration with `tvmc` (apache#8854) [microTVM] Add wrapper for creating project using a MLF (apache#9090) Fix typo (apache#9156) [Hotfix][Testing] Wait for RPCServer to be established (apache#9150) Update find cublas so it search default path if needed. (apache#9149) [TIR][LowerMatchBuffer] Fix lowering strides when source region has higher dimension than the buffer (apache#9145) Fix flaky NMS test by making sure scores are unique (apache#9140) [Relay] Merge analysis/context_analysis.cc and transforms/device_annotation.cc (apache#9038) [LLVM] Make changes needed for opaque pointers (apache#9138) Arm(R) Ethos(TM)-U NPU codegen integration (apache#8849) [CI] Split Integration tests out of first phase of pipeline (apache#9128) [Meta Schedule][M3b] Runner (apache#9111) Fix Google Mock differences between Ubuntu 18.04 and 16.04 (apache#9141) [TIR] add loop partition hint pragma (apache#9121) fix things (apache#9146) [Meta Schedule][M3a] SearchStrategy (apache#9132) [Frontend][PyTorch] support for quantized conv_transpose2d op (apache#9133) [UnitTest] Parametrized test_conv2d_int8_intrinsics (apache#9143) ...
2 parents d961c23 + 7974e30 commit c9b4589

File tree

270 files changed

+18368
-2349
lines changed

Some content is hidden

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

270 files changed

+18368
-2349
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ jobs:
4242
- uses: actions/checkout@v2
4343
- name: Initialize submodules
4444
run: git submodule update --recursive --init
45-
- name: Lint Python
46-
if: startsWith(matrix.os, 'macOS')
47-
run: |
48-
python3 -m pip install flake8
49-
python3 -m flake8 . --count --select=E9,F63,F7 --show-source --statistics
5045
- uses: actions/cache@v1
5146
env:
5247
CACHE_NUMBER: 0

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ endif()
586586
# Create the `cpptest` target if we can find GTest. If not, we create dummy
587587
# targets that give the user an informative error message.
588588
if(GTEST_INCLUDE_DIR AND GTEST_LIB)
589-
file(GLOB TEST_SRCS tests/cpp/*.cc)
589+
file(GLOB_RECURSE TEST_SRCS tests/cpp/*.cc)
590590
add_executable(cpptest ${TEST_SRCS})
591591
target_include_directories(cpptest SYSTEM PUBLIC ${GTEST_INCLUDE_DIR})
592592
target_link_libraries(cpptest PRIVATE ${TVM_TEST_LIBRARY_NAME} ${GTEST_LIB} gtest_main pthread dl)

CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ We do encourage everyone to work anything they are interested in.
136136
- [Jon Soifer](https://github.com/soiferj): @soiferj
137137
- [Zhixun Tan](https://github.com/phisiart): @phisiart
138138
- [Andrew Tulloch](https://github.com/ajtulloch): @ajtulloch
139+
- [Jorn Tuyls](https://github.com/jtuyls): @jtuyls
139140
- [Luis Vega](https://github.com/vegaluisjose): @vegaluisjose
140141
- [Thomas Viehmann](https://github.com/t-vi): @t-vi
141142
- [Yao Wang](https://github.com/kevinthesun): @kevinthesun

Jenkinsfile

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ stage('Build') {
209209
make(ci_gpu, 'build', '-j2')
210210
pack_lib('gpu', tvm_multilib)
211211
// compiler test
212-
sh "${docker_run} ${ci_gpu} ./tests/scripts/task_config_build_gpu_vulkan.sh"
212+
sh "${docker_run} ${ci_gpu} ./tests/scripts/task_config_build_gpu_other.sh"
213213
make(ci_gpu, 'build2', '-j2')
214214
}
215215
}
@@ -224,7 +224,6 @@ stage('Build') {
224224
timeout(time: max_time, unit: 'MINUTES') {
225225
sh "${docker_run} ${ci_cpu} ./tests/scripts/task_ci_setup.sh"
226226
sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_unittest.sh"
227-
sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_integration.sh"
228227
sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_vta_fsim.sh"
229228
sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_vta_tsim.sh"
230229
// sh "${docker_run} ${ci_cpu} ./tests/scripts/task_golang.sh"
@@ -300,6 +299,19 @@ stage('Unit Test') {
300299
}
301300
}
302301
},
302+
'python3: CPU': {
303+
node('CPU') {
304+
ws(per_exec_ws("tvm/ut-python-cpu")) {
305+
init_git()
306+
unpack_lib('cpu', tvm_multilib_tsim)
307+
timeout(time: max_time, unit: 'MINUTES') {
308+
sh "${docker_run} ${ci_cpu} ./tests/scripts/task_ci_setup.sh"
309+
sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_integration.sh"
310+
junit "build/pytest-results/*.xml"
311+
}
312+
}
313+
}
314+
},
303315
'python3: i386': {
304316
node('CPU') {
305317
ws(per_exec_ws("tvm/ut-python-i386")) {

apps/ios_rpc/CMakeLists.txt

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ endif()
3939
# It is required to load unsigned shared modules on real iOS devices
4040
ExternalProject_Add(custom_dso_loader
4141
GIT_REPOSITORY https://github.com/octoml/macho-dyld.git
42-
GIT_TAG 48d1e8b5c40c7f5b744cb089634af17dd86125b2
42+
GIT_TAG 0742b8129de7df1130be355b74faa8c036265bfc
4343
PREFIX custom_dso_loader
4444
LOG_DOWNLOAD TRUE
4545
LOG_CONFIGURE TRUE
@@ -54,24 +54,30 @@ ExternalProject_Add(custom_dso_loader
5454
-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=${CMAKE_BUILD_WITH_INSTALL_NAME_DIR}
5555
)
5656

57+
if(NOT CMAKE_IOS_RPC_BUNDLE)
58+
set(CMAKE_IOS_RPC_BUNDLE org.apache.tvmrpc)
59+
endif()
60+
5761
# iOS RPC Xcode project wrapper to integrate into Cmake
5862
ExternalProject_Add(ios_rpc
5963
PREFIX ios_rpc
60-
DEPENDS custom_dso_loader
64+
DEPENDS custom_dso_loader tvm_runtime
6165
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}
6266
CONFIGURE_COMMAND ""
6367
INSTALL_COMMAND ""
6468
BUILD_COMMAND xcodebuild
65-
-scheme tvmrpc
69+
-target tvmrpc
6670
-configuration ${CMAKE_BUILD_TYPE}
6771
-project <SOURCE_DIR>/tvmrpc.xcodeproj
68-
-derivedDataPath <BINARY_DIR>
6972
-sdk ${CMAKE_OSX_SYSROOT}
7073
-arch ${CMAKE_OSX_ARCHITECTURES}
7174
-hideShellScriptEnvironment
75+
-allowProvisioningUpdates
7276
build
77+
SYMROOT=<BINARY_DIR>
7378
IPHONEOS_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
7479
DEVELOPMENT_TEAM=${CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM}
7580
TVM_BUILD_DIR=${CMAKE_BINARY_DIR}
76-
USE_CUSTOM_DSO_LOADER=YES
81+
USE_CUSTOM_DSO_LOADER=1
82+
PRODUCT_BUNDLE_IDENTIFIER=${CMAKE_IOS_RPC_BUNDLE}
7783
)

0 commit comments

Comments
 (0)