Skip to content

Commit 5133f46

Browse files
committed
Merge branch 'main' into ethosu_allocate_const_pr_15300
2 parents 50b76af + 619bb1d commit 5133f46

File tree

213 files changed

+6926
-1100
lines changed

Some content is hidden

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

213 files changed

+6926
-1100
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

CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ We do encourage everyone to work anything they are interested in.
176176
- [Janet Schneider](https://github.com/janetsc): @janetsc
177177
- [Junru Shao](https://github.com/junrushao): @junrushao
178178
- [Haichen Shen](https://github.com/icemelon): @icemelon
179+
- [Qingchao Shen](https://github.com/jikechao): @jikechao
179180
- [Xingjian Shi](https://github.com/sxjscience): @sxjscience
180181
- [Yuanjing Shi](https://github.com/shingjan): @shingjan
181182
- [Mark Shields](https://github.com/mbs-octoml): @mbs-octoml

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/docker-images.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# This data file is read during when Jenkins runs job to determine docker images.
1919
[jenkins]
2020
ci_arm: tlcpack/ci-arm:20230615-060132-62a5e7acf
21-
ci_cortexm: tlcpack/ci-cortexm:20230613-060122-21361a63a
21+
ci_cortexm: tlcpack/ci-cortexm:20230710-060128-a60cd0fec
2222
ci_cpu: tlcpack/ci-cpu:20230604-060130-0af9ff90e
2323
ci_gpu: tlcpack/ci-gpu:20230504-142417-4d37a0a0
2424
ci_hexagon: tlcpack/ci-hexagon:20230504-142417-4d37a0a0

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/[email protected]

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}"

0 commit comments

Comments
 (0)