From 8fad1e7f0ab9d73592b782292c5638bfb121b565 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 24 Jul 2024 06:55:52 +0000 Subject: [PATCH 01/23] updated v0.2.6 --- recipe/meta.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 11863a1..200a7c4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "autoawq" %} -{% set version = "0.1.6" %} +{% set version = "0.2.6" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://github.com/casper-hansen/{{ name }}/archive/refs/tags/v{{ version }}.tar.gz - sha256: 6b471d83222c3a090ea68f02a15d365afa25f0b5978a92e8265da075d5a6c6ad # 0.1.6 + sha256: e6a3451d1d4cf69cd81cbb816593d6c4144d323c221354b56d1496afd46ec129 # 0.1.6 # sha256: 39e6642c01eca1a15806479d77c91228f9b4ff95827e62baac7019d0cd9bd938 # 0.1.8 build: @@ -24,16 +24,15 @@ build: cat setup.py | sed 's/os.environ\["CC"\] = "g++"//' | sed 's/os.environ\["CXX"\] = "g++"//' > tmpsetup.py mv tmpsetup.py setup.py {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation - number: 1 - skip: True # [cuda_compiler_version == "None"] - skip: True # [cuda_compiler_version == "11.2"] - skip: True # [osx or win] - skip: True # [py == 38] + number: 0 + skip: true # [cuda_compiler_version == "None"] + skip: true # [cuda_compiler_version == "11.2"] + skip: true # [osx or win] + skip: true # [py == 38] missing_dso_whitelist: - '*/libtorch_python.so' requirements: - build: - cmake - make From 74be66f7196d4716e5bfc45fe2582d22a7cb09a2 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 24 Jul 2024 06:56:51 +0000 Subject: [PATCH 02/23] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.24.06.07.47 --- .azure-pipelines/azure-pipelines-linux.yml | 20 ++++----- ...mpiler_version11python3.8.____cpython.yaml | 42 ------------------- ...iler_version11python3.10.____cpython.yaml} | 0 ...iler_version11python3.11.____cpython.yaml} | 0 ...iler_version11python3.12.____cpython.yaml} | 0 ...piler_version11python3.9.____cpython.yaml} | 0 .ci_support/migrations/pytorch23.yaml | 11 ----- .github/CODEOWNERS | 2 +- .scripts/build_steps.sh | 6 +++ README.md | 24 ++++------- 10 files changed, 24 insertions(+), 81 deletions(-) delete mode 100644 .ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml rename .ci_support/{linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml => linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml => linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml => linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml => linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml} (100%) delete mode 100644 .ci_support/migrations/pytorch23.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 5b9907d..aacf8e3 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,24 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - ? linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython - : CONFIG: linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython + linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython: + CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - ? linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython - : CONFIG: linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython + linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython: + CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - ? linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython - : CONFIG: linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython + linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython: + CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - ? linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython - : CONFIG: linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - ? linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython - : CONFIG: linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython + linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython: + CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 timeoutInMinutes: 360 diff --git a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml deleted file mode 100644 index 0376872..0000000 --- a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml +++ /dev/null @@ -1,42 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '11' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '11' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.8 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -pytorch: -- '2.3' -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - c_stdlib_version - - cdt_name - - cuda_compiler - - cuda_compiler_version - - docker_image diff --git a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml diff --git a/.ci_support/migrations/pytorch23.yaml b/.ci_support/migrations/pytorch23.yaml deleted file mode 100644 index c6c744f..0000000 --- a/.ci_support/migrations/pytorch23.yaml +++ /dev/null @@ -1,11 +0,0 @@ -__migrator: - kind: version - commit_message: "Rebuild for pytorch 2.3" - migration_number: 1 - bump_number: 1 - -libtorch: - - '2.3' -pytorch: - - '2.3' -migrator_ts: 1715797797.926 diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index be9162a..5010368 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @mediocretech \ No newline at end of file +* @h-vetinari @mediocretech \ No newline at end of file diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 2f3df6c..6c805a9 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -69,6 +69,12 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/README.md b/README.md index 7e86133..b8e0287 100644 --- a/README.md +++ b/README.md @@ -27,38 +27,31 @@ Current build status - + - + - + - + - - - @@ -190,5 +183,6 @@ In order to produce a uniquely identifiable distribution: Feedstock Maintainers ===================== +* [@h-vetinari](https://github.com/h-vetinari/) * [@mediocretech](https://github.com/mediocretech/) From 36cfc4b2242ceb48668e96d9c85f954a0e3bbcca Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Aug 2024 13:02:59 +1100 Subject: [PATCH 03/23] add install-time dependency of requests --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 200a7c4..89845e0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -48,6 +48,7 @@ requirements: - pytorch >=2.1.0 - wheel - pip + - requests - libxcrypt run: - python From 7c1d16c3de52a0e227342a13063dd05634f0c791 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Aug 2024 13:03:50 +1100 Subject: [PATCH 04/23] add CUDA 12 migration --- .ci_support/migrations/cuda120.yaml | 106 ++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 .ci_support/migrations/cuda120.yaml diff --git a/.ci_support/migrations/cuda120.yaml b/.ci_support/migrations/cuda120.yaml new file mode 100644 index 0000000..9f23a0b --- /dev/null +++ b/.ci_support/migrations/cuda120.yaml @@ -0,0 +1,106 @@ +migrator_ts: 1682985063 +__migrator: + kind: + version + migration_number: + 3 + build_number: + 1 + paused: false + override_cbc_keys: + - cuda_compiler_stub + operation: key_add + check_solvable: false + primary_key: cuda_compiler_version + ordering: + cxx_compiler_version: + - 9 + - 8 + - 7 + c_compiler_version: + - 9 + - 8 + - 7 + fortran_compiler_version: + - 9 + - 8 + - 7 + docker_image: + - quay.io/condaforge/linux-anvil-comp7 # [os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-aarch64 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + - quay.io/condaforge/linux-anvil-ppc64le # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-armv7l # [os.environ.get("BUILD_PLATFORM") == "linux-armv7l"] + - quay.io/condaforge/linux-anvil-cuda:9.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:10.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:10.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:10.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + + # case: CUDA 11.2 + - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + # case: native compilation (build == target) + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + # case: cross-compilation (build != target) + - quay.io/condaforge/linux-anvil-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + + # case: CUDA 11.8 + - quay.io/condaforge/linux-anvil-cuda:11.8 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + # case: native compilation (build == target) + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + # case: cross-compilation (build != target) + - quay.io/condaforge/linux-anvil-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + + # case: non-CUDA builds + - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + cuda_compiler_version: + - None + - 10.2 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.0 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.1 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.2 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.8 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + commit_message: | + Rebuild for CUDA 12 w/arch + Windows support + + The transition to CUDA 12 SDK includes new packages for all CUDA libraries and + build tools. Notably, the cudatoolkit package no longer exists, and packages + should depend directly on the specific CUDA libraries (libcublas, libcusolver, + etc) as needed. For an in-depth overview of the changes and to report problems + [see this issue]( https://github.com/conda-forge/conda-forge.github.io/issues/1963 ). + Please feel free to raise any issues encountered there. Thank you! :pray: + +cuda_compiler: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - cuda-nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cuda_compiler_version: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +c_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cxx_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +fortran_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +c_stdlib_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 2.17 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cdt_name: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-") and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + # case: native compilation (build == target) + - quay.io/condaforge/linux-anvil-ppc64le # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-aarch64 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + # case: cross-compilation (build != target) + - quay.io/condaforge/linux-anvil-cos7-x86_64 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cos7-x86_64 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] From 16b0cf72867a0d5d2fd054b9de73da40303bdfe3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Aug 2024 13:04:51 +1100 Subject: [PATCH 05/23] remove obsolete skip & comments --- recipe/meta.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 89845e0..17f3a70 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,16 +7,13 @@ package: source: url: https://github.com/casper-hansen/{{ name }}/archive/refs/tags/v{{ version }}.tar.gz - sha256: e6a3451d1d4cf69cd81cbb816593d6c4144d323c221354b56d1496afd46ec129 # 0.1.6 - # sha256: 39e6642c01eca1a15806479d77c91228f9b4ff95827e62baac7019d0cd9bd938 # 0.1.8 + sha256: e6a3451d1d4cf69cd81cbb816593d6c4144d323c221354b56d1496afd46ec129 build: - # noarch: python rpaths: - lib/ script_env: - DISABLE_QIGEN=1 # coming soon - - TORCH_CUDA_ARCH_LIST=3.5;5.0;6.0;6.1;7.0;7.5;8.0;8.6+PTX # [cuda_compiler_version == "11.2"] - TORCH_CUDA_ARCH_LIST=3.5;5.0;6.0;6.1;7.0;7.5;8.0;8.6;8.9+PTX # [cuda_compiler_version == "11.8"] - TORCH_CUDA_ARCH_LIST=5.0;6.0;6.1;7.0;7.5;8.0;8.6;8.9;9.0+PTX # [(cuda_compiler_version or "").startswith("12")] - CPATH=${BUILD_PREFIX}/include @@ -26,7 +23,6 @@ build: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation number: 0 skip: true # [cuda_compiler_version == "None"] - skip: true # [cuda_compiler_version == "11.2"] skip: true # [osx or win] skip: true # [py == 38] missing_dso_whitelist: From 8942459aad69484b40939edda204db7b15682647 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Aug 2024 13:09:09 +1100 Subject: [PATCH 06/23] remove cudatoolkit run-dependence --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 17f3a70..0862424 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -61,7 +61,6 @@ requirements: - protobuf - torchvision - tabulate - - cudatoolkit - libtorch test: From d1f9cded5b311c7d2b55376d16ade203810da9f0 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Aug 2024 13:09:47 +1100 Subject: [PATCH 07/23] remove fake variable (name cannot change) --- recipe/meta.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0862424..98dba62 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,12 +1,11 @@ -{% set name = "autoawq" %} {% set version = "0.2.6" %} package: - name: {{ name|lower }} + name: autoawq version: {{ version }} source: - url: https://github.com/casper-hansen/{{ name }}/archive/refs/tags/v{{ version }}.tar.gz + url: https://github.com/casper-hansen/autoawq/archive/refs/tags/v{{ version }}.tar.gz sha256: e6a3451d1d4cf69cd81cbb816593d6c4144d323c221354b56d1496afd46ec129 build: From a03e7a153b9c49854cf13775b9b266f12e4d5c36 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Aug 2024 13:19:34 +1100 Subject: [PATCH 08/23] remove variables that aren't used upstream --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 98dba62..b166666 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,10 +12,8 @@ build: rpaths: - lib/ script_env: - - DISABLE_QIGEN=1 # coming soon - TORCH_CUDA_ARCH_LIST=3.5;5.0;6.0;6.1;7.0;7.5;8.0;8.6;8.9+PTX # [cuda_compiler_version == "11.8"] - TORCH_CUDA_ARCH_LIST=5.0;6.0;6.1;7.0;7.5;8.0;8.6;8.9;9.0+PTX # [(cuda_compiler_version or "").startswith("12")] - - CPATH=${BUILD_PREFIX}/include script: | cat setup.py | sed 's/os.environ\["CC"\] = "g++"//' | sed 's/os.environ\["CXX"\] = "g++"//' > tmpsetup.py mv tmpsetup.py setup.py From 666b81353f373a6bee907360c5b126c5f7d23d9b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Aug 2024 13:21:20 +1100 Subject: [PATCH 09/23] libtorch is now in $PREFIX/lib as expected --- recipe/meta.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b166666..22bfd20 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,8 +9,6 @@ source: sha256: e6a3451d1d4cf69cd81cbb816593d6c4144d323c221354b56d1496afd46ec129 build: - rpaths: - - lib/ script_env: - TORCH_CUDA_ARCH_LIST=3.5;5.0;6.0;6.1;7.0;7.5;8.0;8.6;8.9+PTX # [cuda_compiler_version == "11.8"] - TORCH_CUDA_ARCH_LIST=5.0;6.0;6.1;7.0;7.5;8.0;8.6;8.9;9.0+PTX # [(cuda_compiler_version or "").startswith("12")] @@ -22,8 +20,6 @@ build: skip: true # [cuda_compiler_version == "None"] skip: true # [osx or win] skip: true # [py == 38] - missing_dso_whitelist: - - '*/libtorch_python.so' requirements: build: From b2f6ae9431cf7af64923e3784d2e5f9d124cbf30 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Aug 2024 13:25:39 +1100 Subject: [PATCH 10/23] remove duplicate & redundant run-deps --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 22bfd20..7513dbe 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -42,7 +42,6 @@ requirements: run: - python - pytorch - - torchvision - transformers >=4.35.0 - tokenizers >=0.12.1 - accelerate @@ -54,7 +53,6 @@ requirements: - protobuf - torchvision - tabulate - - libtorch test: imports: From 0457d975f18da6f4a6bf0bf733b24b30f910bf5f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Aug 2024 13:26:49 +1100 Subject: [PATCH 11/23] alphabetize run-dependencies --- recipe/meta.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7513dbe..3679e70 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,18 +41,18 @@ requirements: - libxcrypt run: - python - - pytorch - - transformers >=4.35.0 - - tokenizers >=0.12.1 - accelerate - - sentencepiece + - attributedict - lm_eval + - protobuf + - pytorch + - sentencepiece + - tabulate - texttable + - tokenizers >=0.12.1 - toml - - attributedict - - protobuf - torchvision - - tabulate + - transformers >=4.35.0 test: imports: From e7738bbe8d2ae0e8a353cd3379300a8e52cf0168 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Aug 2024 13:35:39 +1100 Subject: [PATCH 12/23] remove lower bound on pytorch & rely on run-export --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3679e70..8e43072 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,7 +34,7 @@ requirements: - python - packaging - setuptools >=49.4.0 - - pytorch >=2.1.0 + - pytorch - wheel - pip - requests @@ -45,7 +45,6 @@ requirements: - attributedict - lm_eval - protobuf - - pytorch - sentencepiece - tabulate - texttable From 2da5cc6f4c6a24d76a356f46dda2ddad0febcc89 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Aug 2024 14:05:59 +1100 Subject: [PATCH 13/23] update dependencies for 0.2.6 --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8e43072..93d585b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -42,16 +42,16 @@ requirements: run: - python - accelerate - - attributedict - - lm_eval + - datasets + - evaluate + - lm_eval ==0.4.1 - protobuf - - sentencepiece + - scipy - tabulate - - texttable - tokenizers >=0.12.1 - - toml - - torchvision - transformers >=4.35.0 + - typing_extensions >=4.8 + - zstandard test: imports: From 22053d14a81c439d6ca099bee5dc03e0f887fb5e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Aug 2024 14:09:11 +1100 Subject: [PATCH 14/23] handle kernels that got broken out into separate package this commit is easier to view without whitespace changes --- recipe/meta.yaml | 124 ++++++++++++++++++++++++++++++----------------- 1 file changed, 80 insertions(+), 44 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 93d585b..9713b20 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,65 +1,101 @@ {% set version = "0.2.6" %} +{% set kernel_version = "0.0.7" %} package: name: autoawq version: {{ version }} source: - url: https://github.com/casper-hansen/autoawq/archive/refs/tags/v{{ version }}.tar.gz - sha256: e6a3451d1d4cf69cd81cbb816593d6c4144d323c221354b56d1496afd46ec129 + - url: https://github.com/casper-hansen/AutoAWQ/archive/refs/tags/v{{ version }}.tar.gz + sha256: e6a3451d1d4cf69cd81cbb816593d6c4144d323c221354b56d1496afd46ec129 + - url: https://github.com/casper-hansen/AutoAWQ_kernels/archive/refs/tags/v{{ kernel_version }}.tar.gz + sha256: bae8d0fe5a2aff5112c3270fa2d5a6312d5d5693c214d7174b7ff42d595eb0b9 + folder: kernels build: - script_env: - - TORCH_CUDA_ARCH_LIST=3.5;5.0;6.0;6.1;7.0;7.5;8.0;8.6;8.9+PTX # [cuda_compiler_version == "11.8"] - - TORCH_CUDA_ARCH_LIST=5.0;6.0;6.1;7.0;7.5;8.0;8.6;8.9;9.0+PTX # [(cuda_compiler_version or "").startswith("12")] - script: | - cat setup.py | sed 's/os.environ\["CC"\] = "g++"//' | sed 's/os.environ\["CXX"\] = "g++"//' > tmpsetup.py - mv tmpsetup.py setup.py - {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation number: 0 skip: true # [cuda_compiler_version == "None"] skip: true # [osx or win] skip: true # [py == 38] +# break CI jobs per python version requirements: - build: - - cmake - - make - - {{ compiler('c') }} - - {{ stdlib("c") }} - - {{ compiler('cxx') }} - - {{ compiler('cuda') }} - host: - python - - packaging - - setuptools >=49.4.0 - - pytorch - - wheel - - pip - - requests - - libxcrypt - run: - - python - - accelerate - - datasets - - evaluate - - lm_eval ==0.4.1 - - protobuf - - scipy - - tabulate - - tokenizers >=0.12.1 - - transformers >=4.35.0 - - typing_extensions >=4.8 - - zstandard -test: - imports: - - awq - # commands: # pending https://github.com/conda-forge/tcolorpy-feedstock/issues/12 - # - pip check - requires: - - pip +outputs: + - name: autoawq_kernels + version: {{ kernel_version }} + build: + activate_in_script: true + script_env: + - TORCH_CUDA_ARCH_LIST=3.5;5.0;6.0;6.1;7.0;7.5;8.0;8.6;8.9+PTX # [cuda_compiler_version == "11.8"] + - TORCH_CUDA_ARCH_LIST=5.0;6.0;6.1;7.0;7.5;8.0;8.6;8.9;9.0+PTX # [(cuda_compiler_version or "").startswith("12")] + script: | + sed -i 's/os.environ\["CC"\] = "g++"//' kernels/setup.py + sed -i 's/os.environ\["CXX"\] = "g++"//' kernels/setup.py + cd kernels + {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation + skip: true # [cuda_compiler_version == "None"] + skip: true # [osx or win] + skip: true # [py == 38] + + requirements: + build: + - cmake + - make + - {{ stdlib('c') }} + - {{ compiler('c') }} + - {{ compiler('cxx') }} + - {{ compiler('cuda') }} + host: + - python + - pip + - pytorch + test: + imports: + - awq_ext + + - name: autoawq + build: + script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation + skip: true # [cuda_compiler_version == "None"] + skip: true # [osx or win] + skip: true # [py == 38] + requirements: + build: + host: + - python + - {{ pin_subpackage('autoawq_kernels', exact=True) }} + - packaging + - setuptools >=49.4.0 + - pytorch + - wheel + - pip + - requests + - libxcrypt + run: + - python + - {{ pin_subpackage('autoawq_kernels', exact=True) }} + - accelerate + - datasets + - evaluate + - lm_eval ==0.4.1 + - protobuf + - scipy + - tabulate + - tokenizers >=0.12.1 + - transformers >=4.35.0 + - typing_extensions >=4.8 + - zstandard + test: + imports: + - awq + requires: + - pip + commands: + # pending https://github.com/conda-forge/tcolorpy-feedstock/issues/12 + # - pip check about: home: https://github.com/casper-hansen/AutoAWQ From 2accba99da3adcf83660131695642684d4510fb8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Aug 2024 14:14:41 +1100 Subject: [PATCH 15/23] handle new optional package `autoawq[eval]` --- recipe/meta.yaml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9713b20..4b58422 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -79,11 +79,6 @@ outputs: - {{ pin_subpackage('autoawq_kernels', exact=True) }} - accelerate - datasets - - evaluate - - lm_eval ==0.4.1 - - protobuf - - scipy - - tabulate - tokenizers >=0.12.1 - transformers >=4.35.0 - typing_extensions >=4.8 @@ -97,6 +92,25 @@ outputs: # pending https://github.com/conda-forge/tcolorpy-feedstock/issues/12 # - pip check + - name: autoawq-eval + build: + noarch: python + requirements: + host: + - python >=3.8 + - {{ pin_subpackage('autoawq', exact=True) }} + run: + - python >=3.8 + - {{ pin_subpackage('autoawq', exact=True) }} + - evaluate + - lm_eval ==0.4.1 + - protobuf + - scipy + - tabulate + test: + commands: + - echo "pure metapackage" + about: home: https://github.com/casper-hansen/AutoAWQ summary: AutoAWQ is an easy-to-use package for 4-bit quantized models. From a1e866c65442046b5713cdfd9146c1fb8075840a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Aug 2024 14:22:09 +1100 Subject: [PATCH 16/23] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.37.2, and conda-forge-pinning 2024.08.08.18.59.51 --- .azure-pipelines/azure-pipelines-linux.yml | 16 +++++++ ...piler_version12python3.10.____cpython.yaml | 42 +++++++++++++++++++ ...piler_version12python3.11.____cpython.yaml | 42 +++++++++++++++++++ ...piler_version12python3.12.____cpython.yaml | 42 +++++++++++++++++++ ...mpiler_version12python3.9.____cpython.yaml | 42 +++++++++++++++++++ README.md | 36 ++++++++++++++-- build-locally.py | 4 +- 7 files changed, 219 insertions(+), 5 deletions(-) create mode 100644 .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml create mode 100644 .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml create mode 100644 .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml create mode 100644 .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index aacf8e3..3a1a265 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -24,6 +24,22 @@ jobs: CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython: + CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython: + CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython: + CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython: + CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml new file mode 100644 index 0000000..5e2fad3 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml @@ -0,0 +1,42 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +pytorch: +- '2.3' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - c_stdlib_version + - cdt_name + - cuda_compiler + - cuda_compiler_version + - docker_image diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml new file mode 100644 index 0000000..ab02929 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml @@ -0,0 +1,42 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +pytorch: +- '2.3' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - c_stdlib_version + - cdt_name + - cuda_compiler + - cuda_compiler_version + - docker_image diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml new file mode 100644 index 0000000..4469083 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml @@ -0,0 +1,42 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +pytorch: +- '2.3' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - c_stdlib_version + - cdt_name + - cuda_compiler + - cuda_compiler_version + - docker_image diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml new file mode 100644 index 0000000..b636517 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml @@ -0,0 +1,42 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +pytorch: +- '2.3' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - c_stdlib_version + - cdt_name + - cuda_compiler + - cuda_compiler_version + - docker_image diff --git a/README.md b/README.md index b8e0287..8d9442c 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,34 @@ Current build status variant + + + + + + + + + + + +
VariantStatus
linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpythonlinux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython - variant + variant
linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpythonlinux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython - variant + variant
linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpythonlinux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython - variant + variant
linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpythonlinux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython - variant - -
linux_64_c_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython - - variant + variant
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython + + variant + +
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython + + variant + +
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython + + variant + +
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython + + variant + +
@@ -68,6 +96,8 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | | [![Conda Recipe](https://img.shields.io/badge/recipe-autoawq-green.svg)](https://anaconda.org/conda-forge/autoawq) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/autoawq.svg)](https://anaconda.org/conda-forge/autoawq) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/autoawq.svg)](https://anaconda.org/conda-forge/autoawq) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/autoawq.svg)](https://anaconda.org/conda-forge/autoawq) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-autoawq--eval-green.svg)](https://anaconda.org/conda-forge/autoawq-eval) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/autoawq-eval.svg)](https://anaconda.org/conda-forge/autoawq-eval) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/autoawq-eval.svg)](https://anaconda.org/conda-forge/autoawq-eval) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/autoawq-eval.svg)](https://anaconda.org/conda-forge/autoawq-eval) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-autoawq_kernels-green.svg)](https://anaconda.org/conda-forge/autoawq_kernels) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/autoawq_kernels.svg)](https://anaconda.org/conda-forge/autoawq_kernels) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/autoawq_kernels.svg)](https://anaconda.org/conda-forge/autoawq_kernels) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/autoawq_kernels.svg)](https://anaconda.org/conda-forge/autoawq_kernels) | Installing autoawq ================== @@ -79,16 +109,16 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `autoawq` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `autoawq, autoawq-eval, autoawq_kernels` can be installed with `conda`: ``` -conda install autoawq +conda install autoawq autoawq-eval autoawq_kernels ``` or with `mamba`: ``` -mamba install autoawq +mamba install autoawq autoawq-eval autoawq_kernels ``` It is possible to list all of the versions of `autoawq` available on your platform with `conda`: diff --git a/build-locally.py b/build-locally.py index e0d408d..d78427b 100755 --- a/build-locally.py +++ b/build-locally.py @@ -3,11 +3,11 @@ # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): From e32660ce987388ee4502198bd3b76f98595827dc Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Aug 2024 14:29:27 +1100 Subject: [PATCH 17/23] add CUDA 12 dependencies --- recipe/meta.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4b58422..9b43cff 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,12 @@ {% set version = "0.2.6" %} {% set kernel_version = "0.0.7" %} +{% if cuda_compiler_version != "None" %} +{% set cuda_major = environ.get("cuda_compiler_version", "11.8").split(".")[0] | int %} +{% else %} +{% set cuda_major = 0 %} +{% endif %} + package: name: autoawq version: {{ version }} @@ -52,6 +58,13 @@ outputs: - python - pip - pytorch + {% if cuda_major >= 12 %} + - cuda-version {{ cuda_compiler_version }} + - cuda-cudart-dev + - libcublas-dev + - libcusolver-dev + - libcusparse-dev + {% endif %} test: imports: - awq_ext From 1c67c38483ad2c16b9bee18f3b8a1d64dac8634c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 9 Aug 2024 21:22:58 +1100 Subject: [PATCH 18/23] update build script for autoawq_kernels upstream calculates CUDA arches from torch, does not respect TORCH_CUDA_ARCH_LIST anymore --- recipe/meta.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9b43cff..ad5d726 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,14 +34,11 @@ outputs: version: {{ kernel_version }} build: activate_in_script: true - script_env: - - TORCH_CUDA_ARCH_LIST=3.5;5.0;6.0;6.1;7.0;7.5;8.0;8.6;8.9+PTX # [cuda_compiler_version == "11.8"] - - TORCH_CUDA_ARCH_LIST=5.0;6.0;6.1;7.0;7.5;8.0;8.6;8.9;9.0+PTX # [(cuda_compiler_version or "").startswith("12")] - script: | - sed -i 's/os.environ\["CC"\] = "g++"//' kernels/setup.py - sed -i 's/os.environ\["CXX"\] = "g++"//' kernels/setup.py - cd kernels - {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation + script: + - sed -i 's/os.environ\["CC"\] = "g++"//' kernels/setup.py + - sed -i 's/os.environ\["CXX"\] = "g++"//' kernels/setup.py + - cd kernels + - {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation skip: true # [cuda_compiler_version == "None"] skip: true # [osx or win] skip: true # [py == 38] From 133647b5b20065e610df37c32006e5430d5db303 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 28 Aug 2024 09:46:48 +0000 Subject: [PATCH 19/23] Rebuild for pytorch 2.4 --- .ci_support/migrations/pytorch24.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .ci_support/migrations/pytorch24.yaml diff --git a/.ci_support/migrations/pytorch24.yaml b/.ci_support/migrations/pytorch24.yaml new file mode 100644 index 0000000..a075d24 --- /dev/null +++ b/.ci_support/migrations/pytorch24.yaml @@ -0,0 +1,11 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for pytorch 2.4 + kind: version + migration_number: 1 + paused: False +libtorch: +- '2.4' +migrator_ts: 1724386221.5909793 +pytorch: +- '2.4' From 493f1a2ffba2ab7fb15df207162cba34aa166ce3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 29 Aug 2024 13:37:36 +1100 Subject: [PATCH 20/23] simplify skips --- recipe/meta.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ad5d726..d17a51e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,7 +22,6 @@ build: number: 0 skip: true # [cuda_compiler_version == "None"] skip: true # [osx or win] - skip: true # [py == 38] # break CI jobs per python version requirements: @@ -39,9 +38,6 @@ outputs: - sed -i 's/os.environ\["CXX"\] = "g++"//' kernels/setup.py - cd kernels - {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation - skip: true # [cuda_compiler_version == "None"] - skip: true # [osx or win] - skip: true # [py == 38] requirements: build: @@ -69,9 +65,6 @@ outputs: - name: autoawq build: script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation - skip: true # [cuda_compiler_version == "None"] - skip: true # [osx or win] - skip: true # [py == 38] requirements: build: host: From dc74d5b5efdb2378f453a7f994a36415e6f66b53 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 29 Aug 2024 14:29:10 +1100 Subject: [PATCH 21/23] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.0, and conda-forge-pinning 2024.08.28.19.57.49 --- ...version11.8cxx_compiler_version11python3.10.____cpython.yaml | 2 +- ...version11.8cxx_compiler_version11python3.11.____cpython.yaml | 2 +- ...version11.8cxx_compiler_version11python3.12.____cpython.yaml | 2 +- ..._version11.8cxx_compiler_version11python3.9.____cpython.yaml | 2 +- ...version12.0cxx_compiler_version12python3.10.____cpython.yaml | 2 +- ...version12.0cxx_compiler_version12python3.11.____cpython.yaml | 2 +- ...version12.0cxx_compiler_version12python3.12.____cpython.yaml | 2 +- ..._version12.0cxx_compiler_version12python3.9.____cpython.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml index 4e4ec2a..33aa5cd 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml @@ -29,7 +29,7 @@ pin_run_as_build: python: - 3.10.* *_cpython pytorch: -- '2.3' +- '2.4' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml index 53be2e0..805ceb6 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml @@ -29,7 +29,7 @@ pin_run_as_build: python: - 3.11.* *_cpython pytorch: -- '2.3' +- '2.4' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml index c8f71bb..963ae22 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml @@ -29,7 +29,7 @@ pin_run_as_build: python: - 3.12.* *_cpython pytorch: -- '2.3' +- '2.4' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml index 651cfb1..b5e8475 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml @@ -29,7 +29,7 @@ pin_run_as_build: python: - 3.9.* *_cpython pytorch: -- '2.3' +- '2.4' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml index 5e2fad3..c439609 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml @@ -29,7 +29,7 @@ pin_run_as_build: python: - 3.10.* *_cpython pytorch: -- '2.3' +- '2.4' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml index ab02929..f6e9d1d 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml @@ -29,7 +29,7 @@ pin_run_as_build: python: - 3.11.* *_cpython pytorch: -- '2.3' +- '2.4' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml index 4469083..a66d63b 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml @@ -29,7 +29,7 @@ pin_run_as_build: python: - 3.12.* *_cpython pytorch: -- '2.3' +- '2.4' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml index b636517..23a8330 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml @@ -29,7 +29,7 @@ pin_run_as_build: python: - 3.9.* *_cpython pytorch: -- '2.3' +- '2.4' target_platform: - linux-64 zip_keys: From f0934f07d9d306ec8c176906ce685954953e429e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 29 Aug 2024 14:37:46 +1100 Subject: [PATCH 22/23] add setuptools --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d17a51e..5cdbad2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -50,6 +50,7 @@ outputs: host: - python - pip + - setuptools - pytorch {% if cuda_major >= 12 %} - cuda-version {{ cuda_compiler_version }} From 1632103488941b247c8e6161af4ac158a69bedb6 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 29 Aug 2024 15:22:23 +1100 Subject: [PATCH 23/23] DEBUG: skip outputs that cannot find feedstock-local artefacts --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5cdbad2..c8f8bfa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -63,6 +63,7 @@ outputs: imports: - awq_ext +{% if False %} - name: autoawq build: script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation @@ -114,6 +115,7 @@ outputs: test: commands: - echo "pure metapackage" +{% endif %} about: home: https://github.com/casper-hansen/AutoAWQ