Skip to content

Commit 23edbff

Browse files
committed
Merge remote-tracking branch 'upstream/main' into unity-staging
[MERGE] Merge main into unity 2023-08-01
2 parents 72bd41d + 95a2fff commit 23edbff

File tree

167 files changed

+4570
-1044
lines changed

Some content is hidden

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

167 files changed

+4570
-1044
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@
2525
[submodule "3rdparty/cutlass_fpA_intB_gemm"]
2626
path = 3rdparty/cutlass_fpA_intB_gemm
2727
url = https://github.com/tlc-pack/cutlass_fpA_intB_gemm
28+
[submodule "3rdparty/libflash_attn"]
29+
path = 3rdparty/libflash_attn
30+
url = https://github.com/tlc-pack/libflash_attn

3rdparty/libflash_attn

Submodule libflash_attn added at 58b343e

LICENSE

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ Apache Software Foundation License 2.0
214214
3rdparty/OpenCL-Headers
215215
3rdparty/mlperftiny
216216
3rdparty/nvbench (with LLVM exception)
217-
217+
3rdparty/cutlass_fpA_intB_gemm
218218

219219
BSD 2-clause License
220220
--------------------
@@ -247,3 +247,4 @@ BSD 3-Clause "New" or "Revised" License
247247

248248
3rdparty/cutlass
249249
3rdparty/libbacktrace
250+
3rdparty/libflash_attn

ci/jenkins/generated/arm_jenkinsfile.groovy

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

ci/jenkins/templates/arm_jenkinsfile.groovy.j2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
{% call m.invoke_build(
2121
name='BUILD: arm',
22-
node='ARM-SMALL',
22+
node='ARM-GRAVITON3',
2323
condition='!skip_ci && is_docs_only_build != 1',
2424
ws='tvm/build-arm',
2525
docker_image='ci_arm',
@@ -40,7 +40,7 @@
4040
{% call(shard_index, num_shards) m.sharded_test_step(
4141
name="integration: aarch64",
4242
num_shards=4,
43-
node="ARM-SMALL",
43+
node="ARM-GRAVITON3",
4444
ws="tvm/ut-python-arm",
4545
platform="arm",
4646
docker_image="ci_arm",
@@ -57,7 +57,7 @@
5757

5858
{% call(shard_index, num_shards) m.sharded_test_step(
5959
name="topi: aarch64",
60-
node="ARM-SMALL",
60+
node="ARM-GRAVITON3",
6161
ws="tvm/ut-python-arm",
6262
platform="arm",
6363
docker_image="ci_arm",
@@ -82,7 +82,7 @@
8282

8383
{% call(shard_index, num_shards) m.sharded_test_step(
8484
name="frontend: aarch64",
85-
node="ARM-SMALL",
85+
node="ARM-GRAVITON3",
8686
ws="tvm/frontend-python-arm",
8787
platform="arm",
8888
docker_image="ci_arm",

cmake/modules/contrib/NNPack.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,7 @@ if(USE_NNPACK)
3232
list(APPEND TVM_RUNTIME_LINKER_LIBS ${NNPACK_CONTRIB_LIB})
3333
list(APPEND TVM_RUNTIME_LINKER_LIBS ${NNPACK_PTHREAD_CONTRIB_LIB})
3434
list(APPEND TVM_RUNTIME_LINKER_LIBS ${NNPACK_CPUINFO_CONTRIB_LIB})
35-
list(APPEND TVM_RUNTIME_LINKER_LIBS ${NNPACK_CLOG_CONTRIB_LIB})
35+
if(NNPACK_CLOG_CONTRIB_LIB)
36+
list(APPEND TVM_RUNTIME_LINKER_LIBS ${NNPACK_CLOG_CONTRIB_LIB})
37+
endif(NNPACK_CLOG_CONTRIB_LIB)
3638
endif(USE_NNPACK)

docker/install/ubuntu2004_install_python_package.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,5 @@ pip3 install --upgrade \
4343
junitparser==2.4.2 \
4444
six \
4545
tornado \
46-
pytest-lazy-fixture
46+
pytest-lazy-fixture \
47+
git+https://github.com/jax-ml/ml_dtypes.git@v0.2.0

docker/install/ubuntu_download_arm_compute_lib_binaries.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if [ "$architecture_type" != "aarch64" ]; then
2828
gcc-aarch64-linux-gnu
2929
fi
3030

31-
compute_lib_version="v23.02.1"
31+
compute_lib_version="v23.05"
3232
compute_lib_variant="arm64-v8a-neon"
3333
compute_lib_full_name="arm_compute-${compute_lib_version}-bin-linux-${compute_lib_variant}"
3434
compute_lib_base_url="https://github.com/ARM-software/ComputeLibrary/releases/download/${compute_lib_version}"

docker/install/ubuntu_install_jax.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ set -o pipefail
2323
# Install jax and jaxlib
2424
if [ "$1" == "cuda" ]; then
2525
pip3 install --upgrade \
26-
jaxlib==0.4.7 \
27-
"jax[cuda11_pip]==0.4.7" -f https://storage.googleapis.com/jax-releases/jax_cuda_releases.html
26+
jaxlib~=0.4.9 \
27+
"jax[cuda11_pip]~=0.4.9" -f https://storage.googleapis.com/jax-releases/jax_cuda_releases.html
2828
else
2929
pip3 install --upgrade \
30-
jaxlib==0.4.7 \
31-
"jax[cpu]==0.4.7"
30+
jaxlib~=0.4.9 \
31+
"jax[cpu]~=0.4.9"
3232
fi
3333

3434
# Install flax
35-
pip3 install flax==0.6.8
35+
pip3 install flax~=0.6.9

docker/install/ubuntu_install_python_package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pip3 install --upgrade \
2525
"Pygments>=2.4.0" \
2626
attrs \
2727
cloudpickle \
28-
cython \
28+
cython==0.29.34 \
2929
decorator \
3030
mypy \
3131
numpy==1.21.* \

0 commit comments

Comments
 (0)