From e340f44417bc875b504628b5d3e09b714cb35fe8 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 1 Jun 2023 05:44:51 +0000 Subject: [PATCH 01/10] Rebuild for CUDA 12 --- .ci_support/migrations/cuda120.yaml | 72 +++++++++++++++++++++++++++++ conda-forge.yml | 4 +- recipe/meta.yaml | 2 +- 3 files changed, 75 insertions(+), 3 deletions(-) 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..25f0f88 --- /dev/null +++ b/.ci_support/migrations/cuda120.yaml @@ -0,0 +1,72 @@ +migrator_ts: 1682985063 +__migrator: + kind: + version + migration_number: + 1 + 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"] + - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - 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 win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.0 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.1 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 11.2 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12.0 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + commit_message: "Rebuild for CUDA 12" + +cuda_compiler: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - cuda-nvcc # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cuda_compiler_version: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12.0 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +c_compiler_version: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cxx_compiler_version: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +fortran_compiler_version: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 12 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cudnn: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 8 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +cdt_name: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - cos7 # [linux64 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"] diff --git a/conda-forge.yml b/conda-forge.yml index fb2b5a6..e9cdb41 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -3,10 +3,10 @@ azure: store_build_artifacts: true build_platform: osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true provider: linux_aarch64: azure linux_ppc64le: azure test: native_and_emulated -conda_build: - pkg_format: '2' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ec4badd..1b5f410 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "2.1.0" %} -{% set build = 8 %} +{% set build = 9 %} package: name: libastra From 58784a3c110fbea265a59aedd8b24523c5df5aaa Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 1 Jun 2023 05:45:21 +0000 Subject: [PATCH 02/10] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.05.31.22.15.24 --- .azure-pipelines/azure-pipelines-linux.yml | 67 ++++++------ .azure-pipelines/azure-pipelines-win.yml | 8 +- ...er_versionNonecxx_compiler_version12.yaml} | 5 +- ...ler_version12.0cxx_compiler_version12.yaml | 29 +++++ ...ler_version10.2cxx_compiler_version7.yaml} | 1 + ...ler_version11.0cxx_compiler_version9.yaml} | 1 + ...er_version11.1cxx_compiler_version10.yaml} | 1 + ...er_version11.2cxx_compiler_version10.yaml} | 1 + ...er_version11.2cxx_compiler_version10.yaml} | 1 + ...er_versionNonecxx_compiler_version12.yaml} | 5 +- ...er_versionNonecxx_compiler_version12.yaml} | 5 +- ...er_version11.2cxx_compiler_version10.yaml} | 1 + .ci_support/migrations/boost1780.yaml | 9 -- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .../win_64_cuda_compiler_version10.2.yaml | 3 + .../win_64_cuda_compiler_version11.0.yaml | 3 + .../win_64_cuda_compiler_version11.1.yaml | 3 + .../win_64_cuda_compiler_version11.2.yaml | 3 + .../win_64_cuda_compiler_versionNone.yaml | 5 +- .circleci/config.yml | 2 +- .github/workflows/webservices.yml | 2 +- .scripts/create_conda_build_artifacts.bat | 8 +- .scripts/create_conda_build_artifacts.sh | 8 +- .scripts/run_osx_build.sh | 1 - README.md | 101 ++++++++++-------- 26 files changed, 168 insertions(+), 109 deletions(-) rename .ci_support/{linux_64_cuda_compiler_versionNonecxx_compiler_version10.yaml => linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml} (92%) create mode 100644 .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml rename .ci_support/{linux_64_cuda_compiler_version10.2cxx_compiler_version7.yaml => linux_64_cuda_compilernvcccuda_compiler_version10.2cxx_compiler_version7.yaml} (96%) rename .ci_support/{linux_64_cuda_compiler_version11.0cxx_compiler_version9.yaml => linux_64_cuda_compilernvcccuda_compiler_version11.0cxx_compiler_version9.yaml} (96%) rename .ci_support/{linux_64_cuda_compiler_version11.1cxx_compiler_version10.yaml => linux_64_cuda_compilernvcccuda_compiler_version11.1cxx_compiler_version10.yaml} (96%) rename .ci_support/{linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml => linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml} (96%) rename .ci_support/{linux_aarch64_cuda_compiler_version11.2.yaml => linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10.yaml} (96%) rename .ci_support/{linux_aarch64_cuda_compiler_versionNone.yaml => linux_aarch64_cuda_compiler_versionNonecxx_compiler_version12.yaml} (93%) rename .ci_support/{linux_ppc64le_cuda_compiler_versionNone.yaml => linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml} (92%) rename .ci_support/{linux_ppc64le_cuda_compiler_version11.2.yaml => linux_ppc64le_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml} (96%) delete mode 100644 .ci_support/migrations/boost1780.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index b2aeffc..fef9c9b 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,51 +8,56 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_cuda_compiler_version10.2cxx_compiler_version7: - CONFIG: linux_64_cuda_compiler_version10.2cxx_compiler_version7 + linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: + CONFIG: linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_64_cuda_compilerNonecuda_comp_ha008911767 + linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: + CONFIG: linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_64_cuda_compilercuda-nvcccuda_hdae9c4b251 + linux_64_cuda_compilernvcccuda_compiler_version10.2cxx_compiler_version7: + CONFIG: linux_64_cuda_compilernvcccuda_compiler_version10.2cxx_compiler_version7 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - SHORT_CONFIG: linux_64_cuda_compiler_version10.2c_h0954adc41c - linux_64_cuda_compiler_version11.0cxx_compiler_version9: - CONFIG: linux_64_cuda_compiler_version11.0cxx_compiler_version9 + SHORT_CONFIG: linux_64_cuda_compilernvcccuda_comp_h8b230b497e + linux_64_cuda_compilernvcccuda_compiler_version11.0cxx_compiler_version9: + CONFIG: linux_64_cuda_compilernvcccuda_compiler_version11.0cxx_compiler_version9 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 - SHORT_CONFIG: linux_64_cuda_compiler_version11.0c_h62dbc63df4 - linux_64_cuda_compiler_version11.1cxx_compiler_version10: - CONFIG: linux_64_cuda_compiler_version11.1cxx_compiler_version10 + SHORT_CONFIG: linux_64_cuda_compilernvcccuda_comp_h43fec5b733 + linux_64_cuda_compilernvcccuda_compiler_version11.1cxx_compiler_version10: + CONFIG: linux_64_cuda_compilernvcccuda_compiler_version11.1cxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 - SHORT_CONFIG: linux_64_cuda_compiler_version11.1c_he2c669dc93 - linux_64_cuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_64_cuda_compiler_version11.2cxx_compiler_version10 + SHORT_CONFIG: linux_64_cuda_compilernvcccuda_comp_h831ab6e840 + linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: + CONFIG: linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - SHORT_CONFIG: linux_64_cuda_compiler_version11.2c_h0f722a43c2 - linux_64_cuda_compiler_versionNonecxx_compiler_version10: - CONFIG: linux_64_cuda_compiler_versionNonecxx_compiler_version10 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_cuda_compiler_versionNonec_hd850d28420 - linux_aarch64_cuda_compiler_version11.2: - CONFIG: linux_aarch64_cuda_compiler_version11.2 + SHORT_CONFIG: linux_64_cuda_compilernvcccuda_comp_ha4311993d9 + linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10: + CONFIG: linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 - SHORT_CONFIG: linux_aarch64_cuda_compiler_version11.2 - linux_aarch64_cuda_compiler_versionNone: - CONFIG: linux_aarch64_cuda_compiler_versionNone + SHORT_CONFIG: linux_aarch64_cuda_compiler_version_h898d8a47c9 + linux_aarch64_cuda_compiler_versionNonecxx_compiler_version12: + CONFIG: linux_aarch64_cuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - SHORT_CONFIG: linux_aarch64_cuda_compiler_versionNone - linux_ppc64le_cuda_compiler_version11.2: - CONFIG: linux_ppc64le_cuda_compiler_version11.2 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 - SHORT_CONFIG: linux_ppc64le_cuda_compiler_version11.2 - linux_ppc64le_cuda_compiler_versionNone: - CONFIG: linux_ppc64le_cuda_compiler_versionNone + SHORT_CONFIG: linux_aarch64_cuda_compiler_version_hda980ac947 + linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: + CONFIG: linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - SHORT_CONFIG: linux_ppc64le_cuda_compiler_versionNone + SHORT_CONFIG: linux_ppc64le_cuda_compilerNonecuda_h1c24c05a8b + linux_ppc64le_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: + CONFIG: linux_ppc64le_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 + SHORT_CONFIG: linux_ppc64le_cuda_compilernvcccuda_h15c9e2d659 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index f5aea13..1c92be4 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_cuda_compiler_version10.2: @@ -31,6 +31,7 @@ jobs: timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: - task: PythonScript@0 @@ -52,7 +53,7 @@ jobs: - script: | call activate base - mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 @@ -116,6 +117,9 @@ jobs: - script: | set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "TEMP=$(UPLOAD_TEMP)" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" call activate base upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml displayName: Upload package diff --git a/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version10.yaml b/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml similarity index 92% rename from .ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version10.yaml rename to .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index c5261da..bddd9ef 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version10.yaml +++ b/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -7,13 +7,13 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- None cuda_compiler_version: - None cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 pin_run_as_build: @@ -23,6 +23,7 @@ target_platform: - linux-64 zip_keys: - - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml new file mode 100644 index 0000000..7b900fe --- /dev/null +++ b/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -0,0 +1,29 @@ +boost_cpp: +- 1.78.0 +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: + boost-cpp: + max_pin: x.x.x +target_platform: +- linux-64 +zip_keys: +- - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - cdt_name + - docker_image diff --git a/.ci_support/linux_64_cuda_compiler_version10.2cxx_compiler_version7.yaml b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version10.2cxx_compiler_version7.yaml similarity index 96% rename from .ci_support/linux_64_cuda_compiler_version10.2cxx_compiler_version7.yaml rename to .ci_support/linux_64_cuda_compilernvcccuda_compiler_version10.2cxx_compiler_version7.yaml index 0816d1a..29d604a 100644 --- a/.ci_support/linux_64_cuda_compiler_version10.2cxx_compiler_version7.yaml +++ b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version10.2cxx_compiler_version7.yaml @@ -23,6 +23,7 @@ target_platform: - linux-64 zip_keys: - - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_64_cuda_compiler_version11.0cxx_compiler_version9.yaml b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.0cxx_compiler_version9.yaml similarity index 96% rename from .ci_support/linux_64_cuda_compiler_version11.0cxx_compiler_version9.yaml rename to .ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.0cxx_compiler_version9.yaml index 355e77e..a2be616 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.0cxx_compiler_version9.yaml +++ b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.0cxx_compiler_version9.yaml @@ -23,6 +23,7 @@ target_platform: - linux-64 zip_keys: - - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_64_cuda_compiler_version11.1cxx_compiler_version10.yaml b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.1cxx_compiler_version10.yaml similarity index 96% rename from .ci_support/linux_64_cuda_compiler_version11.1cxx_compiler_version10.yaml rename to .ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.1cxx_compiler_version10.yaml index 3c085b1..0cb7122 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.1cxx_compiler_version10.yaml +++ b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.1cxx_compiler_version10.yaml @@ -23,6 +23,7 @@ target_platform: - linux-64 zip_keys: - - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml similarity index 96% rename from .ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml index 1a04580..8e2eda0 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml @@ -23,6 +23,7 @@ target_platform: - linux-64 zip_keys: - - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10.yaml similarity index 96% rename from .ci_support/linux_aarch64_cuda_compiler_version11.2.yaml rename to .ci_support/linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10.yaml index 152e0ef..48dcbb1 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10.yaml @@ -27,6 +27,7 @@ target_platform: - linux-aarch64 zip_keys: - - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNonecxx_compiler_version12.yaml similarity index 93% rename from .ci_support/linux_aarch64_cuda_compiler_versionNone.yaml rename to .ci_support/linux_aarch64_cuda_compiler_versionNonecxx_compiler_version12.yaml index 1bfb3ca..99bedb8 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_versionNonecxx_compiler_version12.yaml @@ -11,13 +11,13 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- None cuda_compiler_version: - None cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-aarch64 pin_run_as_build: @@ -27,6 +27,7 @@ target_platform: - linux-aarch64 zip_keys: - - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml b/.ci_support/linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml similarity index 92% rename from .ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml rename to .ci_support/linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index b5d59b7..87ffa94 100644 --- a/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -7,13 +7,13 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- None cuda_compiler_version: - None cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-ppc64le pin_run_as_build: @@ -23,6 +23,7 @@ target_platform: - linux-ppc64le zip_keys: - - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml b/.ci_support/linux_ppc64le_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml similarity index 96% rename from .ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml rename to .ci_support/linux_ppc64le_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml index 04cbd2e..259aa58 100644 --- a/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml +++ b/.ci_support/linux_ppc64le_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml @@ -23,6 +23,7 @@ target_platform: - linux-ppc64le zip_keys: - - cxx_compiler_version + - cuda_compiler - cuda_compiler_version - cdt_name - docker_image diff --git a/.ci_support/migrations/boost1780.yaml b/.ci_support/migrations/boost1780.yaml deleted file mode 100644 index 9933373..0000000 --- a/.ci_support/migrations/boost1780.yaml +++ /dev/null @@ -1,9 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 3 -boost: -- 1.78.0 -boost_cpp: -- 1.78.0 -migrator_ts: 1662825971 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index f8429f4..73903ff 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -11,7 +11,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index fc6fec6..f081c2a 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -11,7 +11,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: diff --git a/.ci_support/win_64_cuda_compiler_version10.2.yaml b/.ci_support/win_64_cuda_compiler_version10.2.yaml index 19dd83d..024f19c 100644 --- a/.ci_support/win_64_cuda_compiler_version10.2.yaml +++ b/.ci_support/win_64_cuda_compiler_version10.2.yaml @@ -15,3 +15,6 @@ pin_run_as_build: max_pin: x.x.x target_platform: - win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version diff --git a/.ci_support/win_64_cuda_compiler_version11.0.yaml b/.ci_support/win_64_cuda_compiler_version11.0.yaml index c762c03..6ed1b70 100644 --- a/.ci_support/win_64_cuda_compiler_version11.0.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.0.yaml @@ -15,3 +15,6 @@ pin_run_as_build: max_pin: x.x.x target_platform: - win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version diff --git a/.ci_support/win_64_cuda_compiler_version11.1.yaml b/.ci_support/win_64_cuda_compiler_version11.1.yaml index 7c0acad..7db122a 100644 --- a/.ci_support/win_64_cuda_compiler_version11.1.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.1.yaml @@ -15,3 +15,6 @@ pin_run_as_build: max_pin: x.x.x target_platform: - win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version diff --git a/.ci_support/win_64_cuda_compiler_version11.2.yaml b/.ci_support/win_64_cuda_compiler_version11.2.yaml index b864324..b0ddb33 100644 --- a/.ci_support/win_64_cuda_compiler_version11.2.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.2.yaml @@ -15,3 +15,6 @@ pin_run_as_build: max_pin: x.x.x target_platform: - win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index 901a957..4a3e402 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -5,7 +5,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- None cuda_compiler_version: - None cxx_compiler: @@ -15,3 +15,6 @@ pin_run_as_build: max_pin: x.x.x target_platform: - win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa2..8b4ef2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml index 2e5fe71..d6f06b5 100644 --- a/.github/workflows/webservices.yml +++ b/.github/workflows/webservices.yml @@ -7,7 +7,7 @@ jobs: steps: - name: webservices id: webservices - uses: conda-forge/webservices-dispatch-action@master + uses: conda-forge/webservices-dispatch-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.scripts/create_conda_build_artifacts.bat b/.scripts/create_conda_build_artifacts.bat index 79ce625..2853cfd 100755 --- a/.scripts/create_conda_build_artifacts.bat +++ b/.scripts/create_conda_build_artifacts.bat @@ -54,8 +54,8 @@ if defined BLD_ARTIFACT_PREFIX ( echo ##vso[task.setVariable variable=BLD_ARTIFACT_PATH]!BLD_ARTIFACT_PATH! ) if "%CI%" == "github_actions" ( - echo ::set-output name=BLD_ARTIFACT_NAME::!BLD_ARTIFACT_NAME! - echo ::set-output name=BLD_ARTIFACT_PATH::!BLD_ARTIFACT_PATH! + echo BLD_ARTIFACT_NAME=!BLD_ARTIFACT_NAME!>> !GITHUB_OUTPUT! + echo BLD_ARTIFACT_PATH=!BLD_ARTIFACT_PATH!>> !GITHUB_OUTPUT! ) ) @@ -74,7 +74,7 @@ if defined ENV_ARTIFACT_PREFIX ( echo ##vso[task.setVariable variable=ENV_ARTIFACT_PATH]!ENV_ARTIFACT_PATH! ) if "%CI%" == "github_actions" ( - echo ::set-output name=ENV_ARTIFACT_NAME::!ENV_ARTIFACT_NAME! - echo ::set-output name=ENV_ARTIFACT_PATH::!ENV_ARTIFACT_PATH! + echo ENV_ARTIFACT_NAME=!ENV_ARTIFACT_NAME!>> !GITHUB_OUTPUT! + echo ENV_ARTIFACT_PATH=!ENV_ARTIFACT_PATH!>> !GITHUB_OUTPUT! ) ) \ No newline at end of file diff --git a/.scripts/create_conda_build_artifacts.sh b/.scripts/create_conda_build_artifacts.sh index cba0fae..17ec086 100755 --- a/.scripts/create_conda_build_artifacts.sh +++ b/.scripts/create_conda_build_artifacts.sh @@ -79,8 +79,8 @@ if [[ ! -z "$BLD_ARTIFACT_PREFIX" ]]; then echo "##vso[task.setVariable variable=BLD_ARTIFACT_NAME]$BLD_ARTIFACT_NAME" echo "##vso[task.setVariable variable=BLD_ARTIFACT_PATH]$BLD_ARTIFACT_PATH" elif [[ "$CI" == "github_actions" ]]; then - echo "::set-output name=BLD_ARTIFACT_NAME::$BLD_ARTIFACT_NAME" - echo "::set-output name=BLD_ARTIFACT_PATH::$BLD_ARTIFACT_PATH" + echo "BLD_ARTIFACT_NAME=$BLD_ARTIFACT_NAME" >> $GITHUB_OUTPUT + echo "BLD_ARTIFACT_PATH=$BLD_ARTIFACT_PATH" >> $GITHUB_OUTPUT fi fi @@ -107,7 +107,7 @@ if [[ ! -z "$ENV_ARTIFACT_PREFIX" ]]; then echo "##vso[task.setVariable variable=ENV_ARTIFACT_NAME]$ENV_ARTIFACT_NAME" echo "##vso[task.setVariable variable=ENV_ARTIFACT_PATH]$ENV_ARTIFACT_PATH" elif [[ "$CI" == "github_actions" ]]; then - echo "::set-output name=ENV_ARTIFACT_NAME::$ENV_ARTIFACT_NAME" - echo "::set-output name=ENV_ARTIFACT_PATH::$ENV_ARTIFACT_PATH" + echo "ENV_ARTIFACT_NAME=$ENV_ARTIFACT_NAME" >> $GITHUB_OUTPUT + echo "ENV_ARTIFACT_PATH=$ENV_ARTIFACT_PATH" >> $GITHUB_OUTPUT fi fi \ No newline at end of file diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 736a39a..bb00584 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,7 +23,6 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ diff --git a/README.md b/README.md index aa11c10..6514eba 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About libastra -============== +About libastra-feedstock +======================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/libastra-feedstock/blob/main/LICENSE.txt) Home: http://www.astra-toolbox.com Package license: GPL-3.0-only -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/libastra-feedstock/blob/master/LICENSE.txt) - Summary: libastra is a C++ library of high-performance GPU primitives for 2D and 3D tomography. Current build status @@ -20,122 +20,129 @@ Current build status
- - + + - + + + + - + - + - + - + - + - + - + - + From 911ca111cb061ac614f58b097237ce2cf810ae04 Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Wed, 7 Jun 2023 11:33:50 -0500 Subject: [PATCH 03/10] Add CUDA12 libs to dependencies --- recipe/meta.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1b5f410..288de83 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,8 @@ {% set version = "2.1.0" %} {% set build = 9 %} +{% set cuda_major = environ.get("cuda_compiler_version", "11.2").split(".")[0]|int %} + package: name: libastra version: {{ version }} @@ -34,7 +36,10 @@ requirements: - ninja # [not win] host: - boost-cpp - - cudatoolkit # [cuda_compiler_version != "None"] +{% if cuda_major == 12 %} + - cuda-cudart-dev + - libcufft-dev +{% endif %} run: - __cuda # [cuda_compiler_version != "None"] # unix uses pthread, but win links to libboost:threads From b1d72bf00653f9dfc1559438c038ea91340da3b0 Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Wed, 7 Jun 2023 11:40:40 -0500 Subject: [PATCH 04/10] Build for all archs automatically --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 288de83..8821f7c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,13 +26,14 @@ build: script_env: - ASTRA_USE_CUDA=ON # [cuda_compiler_version != "None"] - ASTRA_USE_CUDA=OFF # [cuda_compiler_version == "None"] + - CUDAARCHS=all requirements: build: - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] - {{ compiler('cxx') }} # CMake policy max must be set to 3.22 for CMake to not autodetect architectures - - cmake >=3.18 + - cmake >=3.23 - ninja # [not win] host: - boost-cpp From e8062bdc55a754166188e5e9afbad885cab7322a Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 16:43:13 +0000 Subject: [PATCH 05/10] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.06.07.14.53.06 --- .azure-pipelines/azure-pipelines-linux.yml | 16 +++++----- .azure-pipelines/azure-pipelines-win.yml | 30 +++++++++---------- ...er_versionNonecxx_compiler_version12.yaml} | 0 ...er_version11.2cxx_compiler_version10.yaml} | 0 ...ompilerNonecuda_compiler_versionNone.yaml} | 0 ...ompilernvcccuda_compiler_version10.2.yaml} | 0 ...ompilernvcccuda_compiler_version11.0.yaml} | 0 ...ompilernvcccuda_compiler_version11.1.yaml} | 0 ...ompilernvcccuda_compiler_version11.2.yaml} | 0 README.md | 28 ++++++++--------- 10 files changed, 37 insertions(+), 37 deletions(-) rename .ci_support/{linux_aarch64_cuda_compiler_versionNonecxx_compiler_version12.yaml => linux_aarch64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml} (100%) rename .ci_support/{linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10.yaml => linux_aarch64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml} (100%) rename .ci_support/{win_64_cuda_compiler_versionNone.yaml => win_64_cuda_compilerNonecuda_compiler_versionNone.yaml} (100%) rename .ci_support/{win_64_cuda_compiler_version10.2.yaml => win_64_cuda_compilernvcccuda_compiler_version10.2.yaml} (100%) rename .ci_support/{win_64_cuda_compiler_version11.0.yaml => win_64_cuda_compilernvcccuda_compiler_version11.0.yaml} (100%) rename .ci_support/{win_64_cuda_compiler_version11.1.yaml => win_64_cuda_compilernvcccuda_compiler_version11.1.yaml} (100%) rename .ci_support/{win_64_cuda_compiler_version11.2.yaml => win_64_cuda_compilernvcccuda_compiler_version11.2.yaml} (100%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index fef9c9b..d9c04c5 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -38,16 +38,16 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 SHORT_CONFIG: linux_64_cuda_compilernvcccuda_comp_ha4311993d9 - linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 - SHORT_CONFIG: linux_aarch64_cuda_compiler_version_h898d8a47c9 - linux_aarch64_cuda_compiler_versionNonecxx_compiler_version12: - CONFIG: linux_aarch64_cuda_compiler_versionNonecxx_compiler_version12 + linux_aarch64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: + CONFIG: linux_aarch64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - SHORT_CONFIG: linux_aarch64_cuda_compiler_version_hda980ac947 + SHORT_CONFIG: linux_aarch64_cuda_compilerNonecuda_hb181c36335 + linux_aarch64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: + CONFIG: linux_aarch64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 + SHORT_CONFIG: linux_aarch64_cuda_compilernvcccuda_h67b47a1339 linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: CONFIG: linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 1c92be4..d44e20f 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,26 +8,26 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_cuda_compiler_version10.2: - CONFIG: win_64_cuda_compiler_version10.2 + win_64_cuda_compilerNonecuda_compiler_versionNone: + CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNone UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_cuda_compiler_version10.2 - win_64_cuda_compiler_version11.0: - CONFIG: win_64_cuda_compiler_version11.0 + SHORT_CONFIG: win_64_cuda_compilerNonecuda_compil_hdd26f212be + win_64_cuda_compilernvcccuda_compiler_version10.2: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version10.2 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_cuda_compiler_version11.0 - win_64_cuda_compiler_version11.1: - CONFIG: win_64_cuda_compiler_version11.1 + SHORT_CONFIG: win_64_cuda_compilernvcccuda_compil_h81a63206ec + win_64_cuda_compilernvcccuda_compiler_version11.0: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.0 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_cuda_compiler_version11.1 - win_64_cuda_compiler_version11.2: - CONFIG: win_64_cuda_compiler_version11.2 + SHORT_CONFIG: win_64_cuda_compilernvcccuda_compil_he682213d71 + win_64_cuda_compilernvcccuda_compiler_version11.1: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.1 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_cuda_compiler_version11.2 - win_64_cuda_compiler_versionNone: - CONFIG: win_64_cuda_compiler_versionNone + SHORT_CONFIG: win_64_cuda_compilernvcccuda_compil_hcb89a36015 + win_64_cuda_compilernvcccuda_compiler_version11.2: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.2 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_cuda_compiler_versionNone + SHORT_CONFIG: win_64_cuda_compilernvcccuda_compil_h6dd062e242 timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_aarch64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml similarity index 100% rename from .ci_support/linux_aarch64_cuda_compiler_versionNonecxx_compiler_version12.yaml rename to .ci_support/linux_aarch64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_aarch64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml similarity index 100% rename from .ci_support/linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_aarch64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml similarity index 100% rename from .ci_support/win_64_cuda_compiler_versionNone.yaml rename to .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml diff --git a/.ci_support/win_64_cuda_compiler_version10.2.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version10.2.yaml similarity index 100% rename from .ci_support/win_64_cuda_compiler_version10.2.yaml rename to .ci_support/win_64_cuda_compilernvcccuda_compiler_version10.2.yaml diff --git a/.ci_support/win_64_cuda_compiler_version11.0.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.0.yaml similarity index 100% rename from .ci_support/win_64_cuda_compiler_version11.0.yaml rename to .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.0.yaml diff --git a/.ci_support/win_64_cuda_compiler_version11.1.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.1.yaml similarity index 100% rename from .ci_support/win_64_cuda_compiler_version11.1.yaml rename to .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.1.yaml diff --git a/.ci_support/win_64_cuda_compiler_version11.2.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.2.yaml similarity index 100% rename from .ci_support/win_64_cuda_compiler_version11.2.yaml rename to .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.2.yaml diff --git a/README.md b/README.md index 6514eba..65a637a 100644 --- a/README.md +++ b/README.md @@ -69,17 +69,17 @@ Current build status - + - + @@ -111,38 +111,38 @@ Current build status - + - + - + - + - + From 91ee1f996814d90c0e148c815302268cb20afebb Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Wed, 7 Jun 2023 13:19:08 -0500 Subject: [PATCH 06/10] Use Ninja for all platforms --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8821f7c..403af4c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -27,6 +27,7 @@ build: - ASTRA_USE_CUDA=ON # [cuda_compiler_version != "None"] - ASTRA_USE_CUDA=OFF # [cuda_compiler_version == "None"] - CUDAARCHS=all + - CMAKE_GENERATOR=Ninja requirements: build: @@ -34,7 +35,7 @@ requirements: - {{ compiler('cxx') }} # CMake policy max must be set to 3.22 for CMake to not autodetect architectures - cmake >=3.23 - - ninja # [not win] + - ninja host: - boost-cpp {% if cuda_major == 12 %} From b40b0132779de06efe087bbad51cb1e0957028fc Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Wed, 7 Jun 2023 13:22:04 -0500 Subject: [PATCH 07/10] Verbose logs --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index e42e121..35d238e 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -7,6 +7,6 @@ cmake -GNinja \ ${CMAKE_ARGS} \ ${SRC_DIR} -cmake --build . +cmake --build . -v cmake --install . From b06408fd1d009cb3a36ef031aaf61af6f5c1b555 Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Wed, 7 Jun 2023 16:57:52 -0500 Subject: [PATCH 08/10] Update bld.bat --- recipe/bld.bat | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 42282d6..2842b3a 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -5,6 +5,14 @@ mkdir build cd build if errorlevel 1 exit /b 1 +for /f "tokens=* usebackq" %%f in (`where cl.exe`) do (set "dummy=%%f" && call set "CXX=%%dummy:\=\\%%") +echo %CXX% +for /f "tokens=* usebackq" %%f in (`where cl.exe`) do (set "dummy=%%f" && call set "CC=%%dummy:\=\\%%") +echo %CC% + +set "CMAKE_GENERATOR_PLATFORM=" +set "CMAKE_GENERATOR_TOOLSET=" + :: Conda-forge CUDA build environment does not work with Ninja cmake^ -DBUILD_SHARED_LIBS:BOOL=ON^ From fea6164681dd5e819c0e5c534d8d556cb8e6c837 Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Wed, 7 Jun 2023 17:33:10 -0500 Subject: [PATCH 09/10] Move windows test --- recipe/meta.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 403af4c..394d195 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,6 +15,8 @@ source: - find-cuda.patch build: +# Current tagged release does not compile for CUDA 12. Fix probably with v2.1.3 or later + skip: true # [cuda_compiler_version == "12.0"] track_features: - nocuda_la6JwwDGF7 # [cuda_compiler_version == "None"] run_exports: @@ -53,7 +55,7 @@ test: - {{ pin_compatible('boost-cpp', max_pin='x.x') }} source_files: - build/tests/astratest # [unix] - - build/tests/Release/astratest.exe # [win] + - build/tests/astratest.exe # [win] commands: - test -f $PREFIX/lib/libastra${SHLIB_EXT} # [linux] - test -f $PREFIX/lib/libastra${SHLIB_EXT}.0 # [linux] @@ -63,7 +65,7 @@ test: # consistent between platforms. File links don't work on Windows. - if not exist %LIBRARY_LIB%\\astra.lib exit 1 # [win] - if not exist %LIBRARY_BIN%\\astra.dll exit 1 # [win] - - build\\tests\\Release\\astratest # [win] + - build\\tests\\astratest # [win] about: home: http://www.astra-toolbox.com From 12303b412a180f2d733c9365eaff236936801022 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 22:35:48 +0000 Subject: [PATCH 10/10] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.06.07.14.53.06 --- .azure-pipelines/azure-pipelines-linux.yml | 21 +++++--------- ...ler_version12.0cxx_compiler_version12.yaml | 29 ------------------- ...er_version11.2cxx_compiler_version10.yaml} | 0 ...er_versionNonecxx_compiler_version12.yaml} | 0 README.md | 15 +++------- 5 files changed, 12 insertions(+), 53 deletions(-) delete mode 100644 .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml rename .ci_support/{linux_ppc64le_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml => linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10.yaml} (100%) rename .ci_support/{linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml => linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version12.yaml} (100%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d9c04c5..d9ef932 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -13,11 +13,6 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 SHORT_CONFIG: linux_64_cuda_compilerNonecuda_comp_ha008911767 - linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: - CONFIG: linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_cuda_compilercuda-nvcccuda_hdae9c4b251 linux_64_cuda_compilernvcccuda_compiler_version10.2cxx_compiler_version7: CONFIG: linux_64_cuda_compilernvcccuda_compiler_version10.2cxx_compiler_version7 UPLOAD_PACKAGES: 'True' @@ -48,16 +43,16 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 SHORT_CONFIG: linux_aarch64_cuda_compilernvcccuda_h67b47a1339 - linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: - CONFIG: linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - SHORT_CONFIG: linux_ppc64le_cuda_compilerNonecuda_h1c24c05a8b - linux_ppc64le_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_ppc64le_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 + linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10: + CONFIG: linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 - SHORT_CONFIG: linux_ppc64le_cuda_compilernvcccuda_h15c9e2d659 + SHORT_CONFIG: linux_ppc64le_cuda_compiler_version_h30d188586d + linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version12: + CONFIG: linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version12 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le + SHORT_CONFIG: linux_ppc64le_cuda_compiler_version_h596477b5fe timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml deleted file mode 100644 index 7b900fe..0000000 --- a/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ /dev/null @@ -1,29 +0,0 @@ -boost_cpp: -- 1.78.0 -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: - boost-cpp: - max_pin: x.x.x -target_platform: -- linux-64 -zip_keys: -- - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - cdt_name - - docker_image diff --git a/.ci_support/linux_ppc64le_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10.yaml similarity index 100% rename from .ci_support/linux_ppc64le_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10.yaml diff --git a/.ci_support/linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version12.yaml similarity index 100% rename from .ci_support/linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml rename to .ci_support/linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version12.yaml diff --git a/README.md b/README.md index 65a637a..ccaf924 100644 --- a/README.md +++ b/README.md @@ -33,13 +33,6 @@ Current build status variant - - - - + - +
VariantStatus
linux_64_cuda_compiler_version10.2cxx_compiler_version7linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 + + variant + +
linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 - - variant + + variant
linux_64_cuda_compiler_version11.0cxx_compiler_version9linux_64_cuda_compilernvcccuda_compiler_version10.2cxx_compiler_version7 - - variant + + variant
linux_64_cuda_compiler_version11.1cxx_compiler_version10linux_64_cuda_compilernvcccuda_compiler_version11.0cxx_compiler_version9 - - variant + + variant
linux_64_cuda_compiler_version11.2cxx_compiler_version10linux_64_cuda_compilernvcccuda_compiler_version11.1cxx_compiler_version10 - - variant + + variant
linux_64_cuda_compiler_versionNonecxx_compiler_version10linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 - - variant + + variant
linux_aarch64_cuda_compiler_version11.2linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10 - - variant + + variant
linux_aarch64_cuda_compiler_versionNonelinux_aarch64_cuda_compiler_versionNonecxx_compiler_version12 - - variant + + variant
linux_ppc64le_cuda_compiler_version11.2linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 - - variant + + variant
linux_ppc64le_cuda_compiler_versionNonelinux_ppc64le_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 - - variant + + variant
osx_64 - - variant + + variant
osx_arm64 - - variant + + variant
win_64_cuda_compiler_version10.2 - - variant + + variant
win_64_cuda_compiler_version11.0 - - variant + + variant
win_64_cuda_compiler_version11.1 - - variant + + variant
win_64_cuda_compiler_version11.2 - - variant + + variant
win_64_cuda_compiler_versionNone - - variant + + variant
linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10linux_aarch64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 - variant + variant
linux_aarch64_cuda_compiler_versionNonecxx_compiler_version12linux_aarch64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 - variant + variant
win_64_cuda_compiler_version10.2win_64_cuda_compilerNonecuda_compiler_versionNone - variant + variant
win_64_cuda_compiler_version11.0win_64_cuda_compilernvcccuda_compiler_version10.2 - variant + variant
win_64_cuda_compiler_version11.1win_64_cuda_compilernvcccuda_compiler_version11.0 - variant + variant
win_64_cuda_compiler_version11.2win_64_cuda_compilernvcccuda_compiler_version11.1 - variant + variant
win_64_cuda_compiler_versionNonewin_64_cuda_compilernvcccuda_compiler_version11.2 - variant + variant
linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 - - variant - -
linux_64_cuda_compilernvcccuda_compiler_version10.2cxx_compiler_version7 @@ -83,17 +76,17 @@ Current build status
linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10 - variant + variant
linux_ppc64le_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version12 - variant + variant