Merge branch 'unity' into unity-cmake-native-cuda

CMakeLists.txt

@@ -168,6 +168,11 @@ if(MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
   add_compile_options(/bigobj)
 
+  # Use standard-conforming two-phase name resolution for templates.
+  # This minimizes the differences between g++/clang builds on Linux,
+  # and MSVC builds on Windows.
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-")
+
   # MSVC already errors on undefined symbols, no additional flag needed.
   set(TVM_NO_UNDEFINED_SYMBOLS "")
 
@@ -572,6 +577,7 @@ include(cmake/modules/contrib/VitisAI.cmake)
 include(cmake/modules/contrib/Verilator.cmake)
 include(cmake/modules/contrib/UMA.cmake)
 include(cmake/modules/contrib/MSC.cmake)
+include(cmake/modules/contrib/vllm.cmake)
 include(cmake/modules/Git.cmake)
 include(cmake/modules/LibInfo.cmake)
 include(cmake/modules/RustExt.cmake)

CONTRIBUTORS.md

@@ -40,7 +40,7 @@ We do encourage everyone to work anything they are interested in.
 - [Siyuan Feng](https://github.com/Hzfengsy) (PMC): @Hzfengsy - tir
 - [Josh Fromm](https://github.com/jwfromm) (PMC): @jwfromm - frontends, quantization, topi
 - [Mehrdad Hessar](https://github.com/mehrdadh): @mehrdadh - microTVM, hexagon
-- [Bohan Hou](https://github.com/spectrometerHBH): @spectrometerHBH - tir, arith, tvm-script
+- [Bohan Hou](https://github.com/spectrometerHBH) (PMC): @spectrometerHBH - tir, arith, tvm-script
 - [Yuwei Hu](https://github.com/Huyuwei): @Huyuwei - topi, frontends
 - [Luke Hutton](https://github.com/lhutton1): @lhutton1 - ethos-u, arm
 - [Nick Hynes](https://github.com/nhynes): @nhynes: - sgx, rust
@@ -52,7 +52,7 @@ We do encourage everyone to work anything they are interested in.
 - [Elen Kalda](https://github.com/ekalda): @ekalda - ethos-u, arm
 - [Marisa Kirisame](https://github.com/MarisaKirisame): @MarisaKirisame - relay
 - [Tristan Konolige](https://github.com/tkonolige): @tkonolige - profiling, relay, tir, runtime
-- [Ruihang Lai](https://github.com/MasterJH5574): @MasterJH5574 - tir, tvm-script
+- [Ruihang Lai](https://github.com/MasterJH5574) (PMC): @MasterJH5574 - tir, tvm-script
 - [Wuwei Lin](https://github.com/vinx13) (PMC): @vinx13 - relay, topi, tir, meta_schedule
 - [Yizhi Liu](https://github.com/yzhliu) (PMC): @yzhliu - jvm, topi, relay
 - [Hao Lu](https://github.com/hlu1): @hlu1 - nnpack, frontends
@@ -89,6 +89,8 @@ We do encourage everyone to work anything they are interested in.
 - [Eddie Yan](https://github.com/eqy) (PMC): @eqy - runtime, autotvm, rpc, topi
 - [Zihao Ye](https://github.com/yzh119): @yzh119 - tir
 - [Hao Yu](https://github.com/comaniac): @comaniac (PMC) - relay, byoc, auto_scheduler
+- [Shuai Yuan](https://github.com/ysh329): @ysh329 - ci
+- [Qiang Zhang](https://github.com/Johnson9009): @Johnson9009 - relay, tvm-script
 - [Lianmin Zheng](https://github.com/merrymercy) (PMC): @merrymercy - autotvm, auto_scheduler, topi, relay
 - [Xiyou Zhou](https://github.com/zxybazh): @zxybazh - relay
 - [wrongtest](https://github.com/wrongtest-intellif) (PMC): @wrongtest-intellif - tir, tvm-script, arith
@@ -112,6 +114,7 @@ We do encourage everyone to work anything they are interested in.
 - [Balint Cristian](https://github.com/cbalint13): @cbalint13
 - [Egor Churaev](https://github.com/echuraev): @echuraev
 - [Xiaoqiang Dan](https://github.com/xqdan): @xqdan
+- [Yixin Dong](https://github.com/Ubospica) @Ubospica
 - [Haozheng Fan](https://github.com/hzfan): @hzfan
 - [Siyuan Feng](https://github.com/Hzfengsy): @Hzfengsy
 - [Josh Fromm](https://github.com/jwfromm): @jwfromm
@@ -211,6 +214,7 @@ We do encourage everyone to work anything they are interested in.
 - [Aleksei Yazev](https://github.com/Aleksei-grovety): @Aleksei-grovety
 - [Zihao Ye](https://github.com/yzh119): @yzh119
 - [Hao Yu](https://github.com/comaniac): @comaniac
+- [Shuai Yuan](https://github.com/ysh329): @ysh329
 - [Joshua Z. Zhang](https://github.com/zhreshold): @zhreshold
 - [Lianmin Zheng](https://github.com/merrymercy): @merrymercy
 - [Min Chen](https://github.com/multiverstack-intellif): @multiverstack-intellif

ci/jenkins/docker-images.ini

@@ -17,13 +17,13 @@
 
 # This data file is read during when Jenkins runs job to determine docker images.
 [jenkins]
-ci_arm: tlcpackstaging/ci_arm:20240103-070130-97f6e6507
-ci_cortexm: tlcpackstaging/ci_cortexm:20240103-070130-97f6e6507
-ci_cpu: tlcpackstaging/ci_cpu:20240103-070130-97f6e6507
-ci_gpu: tlcpackstaging/ci_gpu:20240103-070130-97f6e6507
-ci_hexagon: tlcpackstaging/ci_hexagon:20240103-070130-97f6e6507
-ci_i386: tlcpackstaging/ci_i386:20240103-070130-97f6e6507
-ci_lint: tlcpackstaging/ci_lint:20240103-070130-97f6e6507
-ci_minimal: tlcpackstaging/ci_minimal:20240103-070130-97f6e6507
-ci_riscv: tlcpackstaging/ci_riscv:20240103-070130-97f6e6507
-ci_wasm: tlcpackstaging/ci_wasm:20240103-070130-97f6e6507
+ci_arm: tlcpack/ci-arm:20240105-165030-51bdaec6
+ci_cortexm: tlcpack/ci-cortexm:20240105-165030-51bdaec6
+ci_cpu: tlcpack/ci-cpu:20240105-165030-51bdaec6
+ci_gpu: tlcpack/ci-gpu:20240105-165030-51bdaec6
+ci_hexagon: tlcpack/ci-hexagon:20240105-165030-51bdaec6
+ci_i386: tlcpack/ci-i386:20240105-165030-51bdaec6
+ci_lint: tlcpack/ci-lint:20240105-165030-51bdaec6
+ci_minimal: tlcpack/ci-minimal:20240105-165030-51bdaec6
+ci_riscv: tlcpack/ci-riscv:20240105-165030-51bdaec6
+ci_wasm: tlcpack/ci-wasm:20240105-165030-51bdaec6

ci/jenkins/templates/utils/base.groovy.j2

@@ -85,7 +85,7 @@ properties([
 upstream_revision = null
 
 // command to start a docker container
-docker_run = 'docker/bash.sh --env CI --env PLATFORM --env TVM_SHARD_INDEX --env TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS --env TEST_STEP_NAME'
+docker_run = 'docker/bash.sh --env CI --env PLATFORM --env TVM_SHARD_INDEX --env TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM --env SKIP_SLOW_TESTS --env TEST_STEP_NAME --env NVIDIA_DISABLE_REQUIRE=true'
 docker_build = 'docker/build.sh'
 // timeout in minutes
 max_time = 180

ci/jenkins/unity_jenkinsfile.groovy

@@ -30,14 +30,14 @@
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 
 // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. -->
-ci_lint = 'tlcpackstaging/ci_lint:20230504-142417-4d37a0a0'
-ci_gpu = 'tlcpackstaging/ci_gpu:20230504-142417-4d37a0a0'
-ci_cpu = 'tlcpackstaging/ci_cpu:20230513-200357-e54bbc73'
+ci_lint = 'tlcpack/ci-lint:20240105-165030-51bdaec6'
+ci_gpu = 'tlcpack/ci-gpu:20240105-165030-51bdaec6'
+ci_cpu = 'tlcpack/ci-cpu:20240105-165030-51bdaec6'
 ci_wasm = 'tlcpack/ci-wasm:v0.72'
 ci_i386 = 'tlcpack/ci-i386:v0.75'
 ci_qemu = 'tlcpack/ci-qemu:v0.11'
 ci_arm = 'tlcpack/ci-arm:v0.08'
-ci_hexagon = 'tlcpackstaging/ci_hexagon:20230504-142417-4d37a0a0'
+ci_hexagon = 'tlcpack/ci-hexagon:20240105-165030-51bdaec6'
 // <--- End of regex-scanned config.
 
 // Parameters to allow overriding (in Jenkins UI), the images

cmake/modules/contrib/vllm.cmake

@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+if(USE_VLLM)
+  message(STATUS "Build with vllm paged attention kernel.")
+  include_directories(src/runtime/contrib/vllm)
+  enable_language(CUDA)
+
+  tvm_file_glob(GLOB VLLM_CONTRIB_SRC src/runtime/contrib/vllm/*.cu src/runtime/contrib/vllm/*.cc)
+  list(APPEND RUNTIME_SRCS ${VLLM_CONTRIB_SRC})
+endif(USE_VLLM)