Skip to content

Commit f00e3b9

Browse files
committed
[MLC] CI Tweaks
- Revert "[CMake][MSVC] Disable permissive mode for MSVC builds (#16343)" - Skip MSC tests - Disable NNPack and TFLite - Tweak CMAKE_CUDA_ARCHITECTURES
1 parent 890de6e commit f00e3b9

File tree

4 files changed

+27
-8
lines changed

4 files changed

+27
-8
lines changed

CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,6 @@ if(MSVC)
165165
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
166166
add_compile_options(/bigobj)
167167

168-
# Use standard-conforming two-phase name resolution for templates.
169-
# This minimizes the differences between g++/clang builds on Linux,
170-
# and MSVC builds on Windows.
171-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-")
172-
173168
# MSVC already errors on undefined symbols, no additional flag needed.
174169
set(TVM_NO_UNDEFINED_SYMBOLS "")
175170

cmake/modules/CUDA.cmake

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,30 @@ if(USE_CUDA)
140140
# Add CUDA builtins to RelaxVM
141141
tvm_file_glob(GLOB VM_CUDA_BUILTIN_SRC_CC src/runtime/vm/cuda/*.cc)
142142
list(APPEND RUNTIME_SRCS ${VM_CUDA_BUILTIN_SRC_CC})
143+
144+
if(USE_CUTLASS)
145+
if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
146+
set(CMAKE_CUDA_COMPILER ${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc)
147+
execute_process(
148+
COMMAND ${CMAKE_CUDA_COMPILER} --version
149+
OUTPUT_VARIABLE NVCC_VERSION_OUTPUT
150+
)
151+
if(NVCC_VERSION_OUTPUT MATCHES "release ([^,]+),")
152+
set(CUDA_VERSION "${CMAKE_MATCH_1}")
153+
endif(NVCC_VERSION_OUTPUT MATCHES "release ([^,]+),")
154+
message(STATUS "CUDA_VERSION=${CUDA_VERSION}")
155+
156+
if(CUDA_VERSION VERSION_GREATER_EQUAL 11.8)
157+
set(CMAKE_CUDA_ARCHITECTURES "75;80;86;89;90")
158+
else(CUDA_VERSION VERSION_GREATER_EQUAL 11.8)
159+
set(CMAKE_CUDA_ARCHITECTURES "75;80;86")
160+
endif(CUDA_VERSION VERSION_GREATER_EQUAL 11.8)
161+
message(STATUS "Set CMAKE_CUDA_ARCHITECTURES=${CMAKE_CUDA_ARCHITECTURES}")
162+
else(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
163+
message(STATUS "Found CMAKE_CUDA_ARCHITECTURES=${CMAKE_CUDA_ARCHITECTURES}")
164+
endif(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
165+
endif(USE_CUTLASS)
166+
143167
else(USE_CUDA)
144168
list(APPEND COMPILER_SRCS src/target/opt/build_cuda_off.cc)
145169
endif(USE_CUDA)

tests/scripts/task_config_build_cpu.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ echo set\(HIDE_PRIVATE_SYMBOLS ON\) >> config.cmake
3434
# with the change in the way TFLite is built. It can be
3535
# removed once we migrate to TensorFlow and TFLite > 2.9.1
3636
if [ -d "/opt/tflite" ]; then
37-
echo set\(USE_TFLITE \"/opt/tflite\"\) >> config.cmake
37+
echo set\(USE_TFLITE OFF\) >> config.cmake
3838
else
39-
echo set\(USE_TFLITE ON\) >> config.cmake
39+
echo set\(USE_TFLITE OFF\) >> config.cmake
4040
fi
4141

4242
echo set\(USE_TENSORFLOW_PATH \"/tensorflow\"\) >> config.cmake

tests/scripts/unity/task_python_relax.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ TVM_TEST_TARGETS="${TVM_RELAY_TEST_TARGETS:-llvm}" pytest tests/python/dlight
4141
pytest tests/python/contrib/test_msc
4242

4343
# Test for OpenCLML
44-
pytest tests/python/relax/backend/clml/
44+
# pytest tests/python/relax/backend/clml/

0 commit comments

Comments
 (0)