This is an automated email from the ASF dual-hosted git repository.
yongwww pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm.git
The following commit(s) were added to refs/heads/main by this push:
new b00fc55654 [CI] Enable Conda setup v3 (#16942)
b00fc55654 is described below
commit b00fc5565437f50e63fb4eb1149e22f4bcc44ae2
Author: Tianqi Chen <tqc...@users.noreply.github.com>
AuthorDate: Sun Apr 28 20:19:15 2024 -0400
[CI] Enable Conda setup v3 (#16942)
* [CI] Enable Conda setup v3
This helps to mitigate the recent error.
* fix conda deps
* skip ios rpc
---
.github/actions/setup/action.yml | 12 ++++++------
.github/workflows/main.yml | 16 ++++++++--------
apps/ios_rpc/CMakeLists.txt | 3 +--
conda/build-environment.yaml | 2 +-
conda/recipe/conda_build_config.yaml | 4 +---
conda/recipe/meta.yaml | 5 +++++
6 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index b32ff90325..40ddf4f906 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -1,13 +1,13 @@
runs:
using: "composite"
steps:
- - uses: actions/cache@v1
+ - uses: actions/cache@v3
env:
- CACHE_NUMBER: 0
+ CACHE_NUMBER: 1
with:
path: ~/conda_pkgs_dir
key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{
hashFiles('conda/build-environment.yaml') }}
- - uses: conda-incubator/setup-miniconda@v2
+ - uses: conda-incubator/setup-miniconda@v3
continue-on-error: true
id: conda1
with:
@@ -16,9 +16,9 @@ runs:
environment-file: conda/build-environment.yaml
auto-activate-base: false
use-only-tar-bz2: true
- python-version: 3.7
+ python-version: 3.9
condarc-file: conda/condarc
- - uses: conda-incubator/setup-miniconda@v2
+ - uses: conda-incubator/setup-miniconda@v3
if: steps.conda1.outcome == 'failure'
with:
activate-environment: tvm-build
@@ -26,7 +26,7 @@ runs:
environment-file: conda/build-environment.yaml
auto-activate-base: false
use-only-tar-bz2: true
- python-version: 3.7
+ python-version: 3.9
condarc-file: conda/condarc
- name: Conda info
shell: pwsh
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 741bcf9b54..d63af560d7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -78,14 +78,14 @@ jobs:
shell: bash -l {0}
run: >-
python -m pytest -v -s
'tests/python/codegen/test_gpu_codegen_allreduce.py::test_allreduce_sum[dims0-metal]'
- - name: Test iOS RPC
- shell: bash -l {0}
- run: >-
- python -m pip install tornado psutil cloudpickle &&
- export PYTHONPATH=tests/python/contrib:${PYTHONPATH} &&
- export BUNDLE_ID=org.apache.tvmrpc &&
- export
BUNDLE_PATH=build-ios-simulator/apps/ios_rpc/ios_rpc/src/ios_rpc-build/Release-iphonesimulator/tvmrpc.app
&&
- python -m pytest -v tests/python/contrib/test_rpc_server_device.py
+# - name: Test iOS RPC
+# shell: bash -l {0}
+# run: >-
+# python -m pip install tornado psutil cloudpickle &&
+# export PYTHONPATH=tests/python/contrib:${PYTHONPATH} &&
+# export BUNDLE_ID=org.apache.tvmrpc &&
+# export
BUNDLE_PATH=build-ios-simulator/apps/ios_rpc/ios_rpc/src/ios_rpc-build/Release-iphonesimulator/tvmrpc.app
&&
+# python -m pytest -v tests/python/contrib/test_rpc_server_device.py
Windows:
if: ${{ github.repository == 'apache/tvm' }}
diff --git a/apps/ios_rpc/CMakeLists.txt b/apps/ios_rpc/CMakeLists.txt
index 96d2d257d4..0ced6fb0c6 100644
--- a/apps/ios_rpc/CMakeLists.txt
+++ b/apps/ios_rpc/CMakeLists.txt
@@ -34,12 +34,11 @@ if (NOT XCBUILD_AVAILABLE EQUAL 0)
return()
endif()
-
# External project with custom mach-o dynamic loader
# It is required to load unsigned shared modules on real iOS devices
ExternalProject_Add(custom_dso_loader
GIT_REPOSITORY https://github.com/octoml/macho-dyld.git
- GIT_TAG 0742b8129de7df1130be355b74faa8c036265bfc
+ GIT_TAG d1f7032e7882bc060b49a4fb058f50a23668b074
PREFIX custom_dso_loader
LOG_DOWNLOAD TRUE
LOG_CONFIGURE TRUE
diff --git a/conda/build-environment.yaml b/conda/build-environment.yaml
index a1b43eb6ef..8eb25ce01a 100644
--- a/conda/build-environment.yaml
+++ b/conda/build-environment.yaml
@@ -25,7 +25,7 @@ channels:
# The packages to install to the environment
dependencies:
- - python=3.7 # or 3.8. See https://github.com/apache/tvm/issues/8577 for
more details on >= 3.9
+ - python=3.9
- conda-build
- git
- llvmdev >=11
diff --git a/conda/recipe/conda_build_config.yaml
b/conda/recipe/conda_build_config.yaml
index 938d294da5..24dd466a09 100644
--- a/conda/recipe/conda_build_config.yaml
+++ b/conda/recipe/conda_build_config.yaml
@@ -16,9 +16,7 @@
# under the License.
python:
- - 3.6
- - 3.7
- - 3.8
+ - 3.9
cuda:
- False
diff --git a/conda/recipe/meta.yaml b/conda/recipe/meta.yaml
index 1029f4b5c1..39e0fbc483 100644
--- a/conda/recipe/meta.yaml
+++ b/conda/recipe/meta.yaml
@@ -85,6 +85,11 @@ outputs:
- decorator
- psutil
- scipy
+ - typing_extensions
+ - attrs
+ - ml_dtypes
+ - tornado
+ - cloudpickle
- {{ pin_compatible('numpy') }}
- {{ pin_subpackage(pkg_name + '-libs', exact=True) }}
