diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 94cc204..3c6ece0 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,11 +11,15 @@ jobs: linux_64_: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_: - CONFIG: linux_aarch64_ + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:cos7 + linux_aarch64_arm_variant_typesbsa: + CONFIG: linux_aarch64_arm_variant_typesbsa UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:cos7 + linux_aarch64_arm_variant_typetegra: + CONFIG: linux_aarch64_arm_variant_typetegra + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:cos7 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 9901917..13022dd 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -24,6 +24,7 @@ jobs: displayName: Run Windows build env: MINIFORGE_HOME: $(MINIFORGE_HOME) + CONDA_BLD_PATH: $(CONDA_BLD_PATH) PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 6782f6c..d4ea826 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:cos7 target_platform: - linux-64 xz: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_arm_variant_typesbsa.yaml similarity index 78% rename from .ci_support/linux_aarch64_.yaml rename to .ci_support/linux_aarch64_arm_variant_typesbsa.yaml index 014e8df..98f4ab9 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_arm_variant_typesbsa.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu arm_variant_type: - sbsa c_compiler: @@ -10,8 +8,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - conda channel_sources: @@ -23,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:cos7 target_platform: - linux-aarch64 xz: diff --git a/.ci_support/linux_aarch64_arm_variant_typetegra.yaml b/.ci_support/linux_aarch64_arm_variant_typetegra.yaml new file mode 100644 index 0000000..ae87e6e --- /dev/null +++ b/.ci_support/linux_aarch64_arm_variant_typetegra.yaml @@ -0,0 +1,29 @@ +arm_variant_type: +- tegra +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:cos7 +target_platform: +- linux-aarch64 +xz: +- '5' +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index cc0d2c4..2e7dd39 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -36,6 +36,7 @@ if !errorlevel! neq 0 exit /b !errorlevel! echo Removing %MAMBA_ROOT_PREFIX% del /S /Q "%MAMBA_ROOT_PREFIX%" >nul del /S /Q "%MICROMAMBA_TMPDIR%" >nul +call :end_group call :start_group "Configuring conda" diff --git a/README.md b/README.md index a361af5..38e7bee 100644 --- a/README.md +++ b/README.md @@ -39,10 +39,17 @@ Current build status - linux_aarch64 + linux_aarch64_arm_variant_typesbsa - variant + variant + + + + linux_aarch64_arm_variant_typetegra + + + variant diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 52229a8..7f5d478 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,2 +1,3 @@ arm_variant_type: # [aarch64] - sbsa # [aarch64] + - tegra # [aarch64] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 345caa8..92f49c5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -3,11 +3,13 @@ {% set cuda_version = "12.6" %} {% set platform = "linux-x86_64" %} # [linux64] {% set platform = "linux-ppc64le" %} # [ppc64le] -{% set platform = "linux-sbsa" %} # [aarch64] +{% set platform = "linux-sbsa" %} # [aarch64 and arm_variant_type=="sbsa"] +{% set platform = "linux-aarch64" %} # [aarch64 and arm_variant_type=="tegra"] {% set platform = "windows-x86_64" %} # [win] {% set target_name = "x86_64-linux" %} # [linux64] {% set target_name = "ppc64le-linux" %} # [ppc64le] -{% set target_name = "sbsa-linux" %} # [aarch64] +{% set target_name = "sbsa-linux" %} # [aarch64 and arm_variant_type=="sbsa"] +{% set target_name = "tegra-linux" %} # [aarch64 and arm_variant_type=="tegra"] {% set target_name = "x64" %} # [win] {% set extension = "tar.xz" %} # [not win] {% set extension = "zip" %} # [win] @@ -19,7 +21,8 @@ package: source: url: https://developer.download.nvidia.com/compute/cuda/redist/{{ name }}/{{ platform }}/{{ name }}-{{ platform }}-{{ version }}-archive.{{ extension }} sha256: ec682bac6387f9cdfd0c20b25a16cd6ed0b8b3b7ff42be9eaeb41828e3a72572 # [linux64] - sha256: 84668dcb2159f9efd912a66ed5afe5d6533b72a81bbabc98b26ac7ac7a36105a # [aarch64] + sha256: 84668dcb2159f9efd912a66ed5afe5d6533b72a81bbabc98b26ac7ac7a36105a # [aarch64 and arm_variant_type=="sbsa"] + sha256: d5b8f6f5a2ab34066c267daf5f73f25d2f24ea25d8fa3dce427c196ff07504e7 # [aarch64 and arm_variant_type=="tegra"] sha256: 1a87ec80f8c0e5a39badc87010d479930c5b63abd788b3a05bd688a5980a3d07 # [win] build: