From ba9147998206c3dd0f0271bb5352a3373fa79f0d Mon Sep 17 00:00:00 2001 From: tqchen Date: Sat, 27 Apr 2024 13:51:03 -0400 Subject: [PATCH 1/3] [CI] Enable Conda setup v3 This helps to mitigate the recent error. --- .github/actions/setup/action.yml | 12 ++++++------ apps/ios_rpc/CMakeLists.txt | 3 +-- conda/build-environment.yaml | 2 +- conda/recipe/conda_build_config.yaml | 4 +--- conda/recipe/meta.yaml | 1 + 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index b32ff90325d7..40ddf4f90678 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/apps/ios_rpc/CMakeLists.txt b/apps/ios_rpc/CMakeLists.txt index 96d2d257d4ad..0ced6fb0c691 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 a1b43eb6ef0c..8eb25ce01ac7 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 938d294da556..24dd466a0942 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 1029f4b5c193..fb863ddc292a 100644 --- a/conda/recipe/meta.yaml +++ b/conda/recipe/meta.yaml @@ -85,6 +85,7 @@ outputs: - decorator - psutil - scipy + - typing_extensions - {{ pin_compatible('numpy') }} - {{ pin_subpackage(pkg_name + '-libs', exact=True) }} From 7adbb3be27cff7f81c26d970d588bdbc04706590 Mon Sep 17 00:00:00 2001 From: tqchen Date: Sat, 27 Apr 2024 19:40:52 -0400 Subject: [PATCH 2/3] fix conda deps --- conda/recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conda/recipe/meta.yaml b/conda/recipe/meta.yaml index fb863ddc292a..39e0fbc483f4 100644 --- a/conda/recipe/meta.yaml +++ b/conda/recipe/meta.yaml @@ -86,6 +86,10 @@ outputs: - psutil - scipy - typing_extensions + - attrs + - ml_dtypes + - tornado + - cloudpickle - {{ pin_compatible('numpy') }} - {{ pin_subpackage(pkg_name + '-libs', exact=True) }} From eeca2417d9a606aaf289a3516ae8a14c96a38a52 Mon Sep 17 00:00:00 2001 From: tqchen Date: Sun, 28 Apr 2024 15:49:46 -0400 Subject: [PATCH 3/3] skip ios rpc --- .github/workflows/main.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 741bcf9b548b..d63af560d704 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' }}