diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 130e1ab..a5e8e75 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,38 +8,38 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython: - CONFIG: linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.11.____cpython: - CONFIG: linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.8.____cpython: - CONFIG: linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.9.____cpython: - CONFIG: linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython: - CONFIG: linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython + linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython: + CONFIG: linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython: - CONFIG: linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython + linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython: + CONFIG: linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython: - CONFIG: linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython + linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython: + CONFIG: linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython: - CONFIG: linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython + linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython: + CONFIG: linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython: + CONFIG: linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.11.____cpython: + CONFIG: linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.8.____cpython: + CONFIG: linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.9.____cpython: + CONFIG: linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml new file mode 100755 index 0000000..6ba8295 --- /dev/null +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -0,0 +1,42 @@ +# 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 -*- + +jobs: +- job: osx + pool: + vmImage: macOS-11 + strategy: + matrix: + osx_64_python3.10.____cpython: + CONFIG: osx_64_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_python3.11.____cpython: + CONFIG: osx_64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_python3.8.____cpython: + CONFIG: osx_64_python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_python3.9.____cpython: + CONFIG: osx_64_python3.9.____cpython + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 + + steps: + # TODO: Fast finish on azure pipelines? + - script: | + export CI=azure + export OSX_FORCE_SDK_DOWNLOAD="1" + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi + ./.scripts/run_osx_build.sh + displayName: Run OSX build + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml rename to .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml diff --git a/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml rename to .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml diff --git a/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml b/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml rename to .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml diff --git a/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml rename to .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml diff --git a/.ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython.yaml b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython.yaml rename to .ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython.yaml diff --git a/.ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.11.____cpython.yaml b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.11.____cpython.yaml rename to .ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.11.____cpython.yaml diff --git a/.ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.8.____cpython.yaml b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.8.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.8.____cpython.yaml rename to .ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.8.____cpython.yaml diff --git a/.ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.9.____cpython.yaml b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.9.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.9.____cpython.yaml rename to .ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.9.____cpython.yaml diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml deleted file mode 100644 index c00be95..0000000 --- a/.ci_support/migrations/python311.yaml +++ /dev/null @@ -1,37 +0,0 @@ -migrator_ts: 1666686085 -__migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.11.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 60 - max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - -python: - - 3.11.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.23 -python_impl: - - cpython diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml new file mode 100644 index 0000000..57b7c20 --- /dev/null +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -0,0 +1,24 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +pytorch: +- '2.0' +target_platform: +- osx-64 diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml new file mode 100644 index 0000000..f9b348d --- /dev/null +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -0,0 +1,24 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +pytorch: +- '2.0' +target_platform: +- osx-64 diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml new file mode 100644 index 0000000..2993b94 --- /dev/null +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -0,0 +1,24 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +pytorch: +- '2.0' +target_platform: +- osx-64 diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml new file mode 100644 index 0000000..a1cb2f4 --- /dev/null +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -0,0 +1,24 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +pytorch: +- '2.0' +target_platform: +- osx-64 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 595f8b5..d20d8f4 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,11 +31,10 @@ pkgs_dirs: CONDARC - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c..aff009f 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh new file mode 100755 index 0000000..4758f0d --- /dev/null +++ b/.scripts/run_osx_build.sh @@ -0,0 +1,90 @@ +#!/usr/bin/env bash + +# -*- mode: jinja-shell -*- + +source .scripts/logging_utils.sh + +set -xe + +MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} + +( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null + +MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" +MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" +rm -rf ${MINIFORGE_HOME} +bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} + +( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null + +source ${MINIFORGE_HOME}/etc/profile.d/conda.sh +conda activate base + +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 + + + +echo -e "\n\nSetting up the condarc and mangling the compiler." +setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml + +if [[ "${CI:-}" != "" ]]; then + mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml +fi + +if [[ "${CI:-}" != "" ]]; then + echo -e "\n\nMangling homebrew in the CI to avoid conflicts." + /usr/bin/sudo mangle_homebrew + /usr/bin/sudo -k +else + echo -e "\n\nNot mangling homebrew as we are not running in CI" +fi + +echo -e "\n\nRunning the build setup script." +source run_conda_forge_build_setup + + + +( endgroup "Configuring conda" ) 2> /dev/null + +echo -e "\n\nMaking the build clobber file" +make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml + +if [[ -f LICENSE.txt ]]; then + cp LICENSE.txt "recipe/recipe-scripts-license.txt" +fi + +if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then + if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" + fi + conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ + ${EXTRA_CB_OPTIONS:-} \ + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + + # Drop into an interactive shell + /bin/bash +else + + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + --suppress-variables ${EXTRA_CB_OPTIONS:-} \ + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + ( startgroup "Validating outputs" ) 2> /dev/null + + validate_recipe_outputs "${FEEDSTOCK_NAME}" + + ( endgroup "Validating outputs" ) 2> /dev/null + + ( startgroup "Uploading packages" ) 2> /dev/null + + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml + fi + + ( endgroup "Uploading packages" ) 2> /dev/null +fi \ No newline at end of file diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 0000000..c4486d9 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,112 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/README.md b/README.md index a2317f1..7cbc440 100644 --- a/README.md +++ b/README.md @@ -27,59 +27,87 @@ Current build status - + - + - + - + - + - + - + - + + + + + + + + + + + + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ad85a2c..33a441c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,4 +3,5 @@ # -*- mode: yaml -*- jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 09d38a9..0ce3208 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,13 +9,15 @@ package: source: url: https://github.com/openmm/NNPOps/archive/refs/tags/v{{ version }}.tar.gz sha256: d7854a3506720aa7536ce64ea9b8d621cad5c024ba4979f2156afcc88b2117a3 + patches: + - patches/fix-osx-lib-loading.patch # [osx] build: - skip: true # [not linux] + skip: true # [win] # as of pytorch 1.13, conda-forge only builds for CUDA 11.2+, see # https://github.com/conda-forge/conda-forge-pinning-feedstock/issues/3491 skip: true # [cuda_compiler_version not in ("None", "11.2")] - number: 1 + number: 2 rpaths: - lib/ - {{ SP_DIR }}/torch/lib diff --git a/recipe/patches/fix-osx-lib-loading.patch b/recipe/patches/fix-osx-lib-loading.patch new file mode 100644 index 0000000..170868f --- /dev/null +++ b/recipe/patches/fix-osx-lib-loading.patch @@ -0,0 +1,18 @@ +--- a/src/pytorch/__init__.py (revision d15cb9196e283b6b55f88a93d85232458f64fa18) ++++ b/src/pytorch/__init__.py (date 1697288232453) +@@ -3,8 +3,14 @@ + ''' + import os.path + import torch ++from torch.utils.cpp_extension import IS_WINDOWS, IS_MACOS, LIB_EXT + +-torch.ops.load_library(os.path.join(os.path.dirname(__file__), 'libNNPOpsPyTorch.so')) ++# by default torch assumes OSX has a .so ext, so we need to override ++_LIBRARY_SUFFIX = LIB_EXT if not IS_MACOS else ".dylib" ++_LIBRARY_PREFIX = '' if IS_WINDOWS else "lib" ++_LIBRARY_NAME = f'{_LIBRARY_PREFIX}NNPOpsPyTorch{_LIBRARY_SUFFIX}' ++ ++torch.ops.load_library(os.path.join(os.path.dirname(__file__), _LIBRARY_NAME)) + + + from NNPOps.OptimizedTorchANI import OptimizedTorchANI
VariantStatus
linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.10.____cpythonlinux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython - variant + variant
linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.11.____cpythonlinux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython - variant + variant
linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.8.____cpythonlinux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython - variant + variant
linux_64_cuda_compiler_version11.2cxx_compiler_version10python3.9.____cpythonlinux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython - variant + variant
linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.10.____cpythonlinux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.10.____cpython - variant + variant
linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.11.____cpythonlinux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.11.____cpython - variant + variant
linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.8.____cpythonlinux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.8.____cpython - variant + variant
linux_64_cuda_compiler_versionNonecxx_compiler_version12python3.9.____cpythonlinux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10python3.9.____cpython - variant + variant + +
osx_64_python3.10.____cpython + + variant + +
osx_64_python3.11.____cpython + + variant + +
osx_64_python3.8.____cpython + + variant + +
osx_64_python3.9.____cpython + + variant