diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 14729dc..a137c36 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,20 +8,20 @@ jobs: vmImage: ubuntu-16.04 strategy: matrix: - linux_64_numpy1.17python3.6.____cpython: - CONFIG: linux_64_numpy1.17python3.6.____cpython + linux_64_python3.6.____cpython: + CONFIG: linux_64_python3.6.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_numpy1.17python3.7.____cpython: - CONFIG: linux_64_numpy1.17python3.7.____cpython + linux_64_python3.7.____cpython: + CONFIG: linux_64_python3.7.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_numpy1.17python3.8.____cpython: - CONFIG: linux_64_numpy1.17python3.8.____cpython + linux_64_python3.8.____cpython: + CONFIG: linux_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_numpy1.19python3.9.____cpython: - CONFIG: linux_64_numpy1.19python3.9.____cpython + linux_64_python3.9.____cpython: + CONFIG: linux_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 92a69c1..8aadc55 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,17 +8,17 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_numpy1.17python3.6.____cpython: - CONFIG: osx_64_numpy1.17python3.6.____cpython + osx_64_python3.6.____cpython: + CONFIG: osx_64_python3.6.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.17python3.7.____cpython: - CONFIG: osx_64_numpy1.17python3.7.____cpython + osx_64_python3.7.____cpython: + CONFIG: osx_64_python3.7.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.17python3.8.____cpython: - CONFIG: osx_64_numpy1.17python3.8.____cpython + osx_64_python3.8.____cpython: + CONFIG: osx_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.19python3.9.____cpython: - CONFIG: osx_64_numpy1.19python3.9.____cpython + osx_64_python3.9.____cpython: + CONFIG: osx_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml new file mode 100755 index 0000000..5c854f7 --- /dev/null +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -0,0 +1,119 @@ +# 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: win + pool: + vmImage: vs2017-win2016 + strategy: + matrix: + win_64_python3.6.____cpython: + CONFIG: win_64_python3.6.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.7.____cpython: + CONFIG: win_64_python3.7.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.8.____cpython: + CONFIG: win_64_python3.8.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.9.____cpython: + CONFIG: win_64_python3.9.____cpython + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 + variables: + CONDA_BLD_PATH: D:\\bld\\ + + steps: + - script: | + choco install vcpython27 -fdv -y --debug + condition: contains(variables['CONFIG'], 'vs2008') + displayName: Install vcpython27.msi (if needed) + + # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) + # - script: rmdir C:\cygwin /s /q + # continueOnError: true + + - powershell: | + Set-PSDebug -Trace 1 + + $batchcontent = @" + ECHO ON + SET vcpython=C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0 + + DIR "%vcpython%" + + CALL "%vcpython%\vcvarsall.bat" %* + "@ + + $batchDir = "C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0\VC" + $batchPath = "$batchDir" + "\vcvarsall.bat" + New-Item -Path $batchPath -ItemType "file" -Force + + Set-Content -Value $batchcontent -Path $batchPath + + Get-ChildItem -Path $batchDir + + Get-ChildItem -Path ($batchDir + '\..') + + condition: contains(variables['CONFIG'], 'vs2008') + displayName: Patch vs2008 (if needed) + + - task: CondaEnvironment@1 + inputs: + packageSpecs: 'python=3.6 conda-build conda "conda-forge-ci-setup=3" pip' # Optional + installOptions: "-c conda-forge" + updateConda: true + displayName: Install conda-build and activate environment + + - script: set PYTHONUNBUFFERED=1 + displayName: Set PYTHONUNBUFFERED + + # Configure the VM + - script: | + call activate base + setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml + displayName: conda-forge CI setup + + # Configure the VM. + - script: | + set "CI=azure" + call activate base + run_conda_forge_build_setup + displayName: conda-forge build setup + + + # Special cased version setting some more things! + - script: | + call activate base + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml + displayName: Build recipe (vs2008) + env: + VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" + PYTHONUNBUFFERED: 1 + condition: contains(variables['CONFIG'], 'vs2008') + + - script: | + call activate base + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml + displayName: Build recipe + env: + PYTHONUNBUFFERED: 1 + condition: not(contains(variables['CONFIG'], 'vs2008')) + - script: | + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + call activate base + validate_recipe_outputs "%FEEDSTOCK_NAME%" + displayName: Validate Recipe Outputs + + - script: | + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + call activate base + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + displayName: Upload package + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False'))) \ No newline at end of file diff --git a/.ci_support/linux_64_numpy1.17python3.6.____cpython.yaml b/.ci_support/linux_64_python3.6.____cpython.yaml similarity index 84% rename from .ci_support/linux_64_numpy1.17python3.6.____cpython.yaml rename to .ci_support/linux_64_python3.6.____cpython.yaml index 62f89e1..bd0e54c 100644 --- a/.ci_support/linux_64_numpy1.17python3.6.____cpython.yaml +++ b/.ci_support/linux_64_python3.6.____cpython.yaml @@ -5,13 +5,11 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- pytorch,conda-forge,defaults channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-cuda:10.2 -numpy: -- '1.17' pin_run_as_build: python: min_pin: x.x @@ -23,5 +21,3 @@ target_platform: zip_keys: - - cdt_name - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.17python3.7.____cpython.yaml b/.ci_support/linux_64_python3.7.____cpython.yaml similarity index 84% rename from .ci_support/linux_64_numpy1.17python3.7.____cpython.yaml rename to .ci_support/linux_64_python3.7.____cpython.yaml index 0cca17f..8e62b7a 100644 --- a/.ci_support/linux_64_numpy1.17python3.7.____cpython.yaml +++ b/.ci_support/linux_64_python3.7.____cpython.yaml @@ -5,13 +5,11 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- pytorch,conda-forge,defaults channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-cuda:10.2 -numpy: -- '1.17' pin_run_as_build: python: min_pin: x.x @@ -23,5 +21,3 @@ target_platform: zip_keys: - - cdt_name - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.17python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml similarity index 84% rename from .ci_support/linux_64_numpy1.17python3.8.____cpython.yaml rename to .ci_support/linux_64_python3.8.____cpython.yaml index d3391a5..c600ffd 100644 --- a/.ci_support/linux_64_numpy1.17python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -5,13 +5,11 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- pytorch,conda-forge,defaults channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-cuda:10.2 -numpy: -- '1.17' pin_run_as_build: python: min_pin: x.x @@ -23,5 +21,3 @@ target_platform: zip_keys: - - cdt_name - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml similarity index 84% rename from .ci_support/linux_64_numpy1.19python3.9.____cpython.yaml rename to .ci_support/linux_64_python3.9.____cpython.yaml index cc6db99..bb5c337 100644 --- a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -5,13 +5,11 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- pytorch,conda-forge,defaults channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-cuda:10.2 -numpy: -- '1.19' pin_run_as_build: python: min_pin: x.x @@ -23,5 +21,3 @@ target_platform: zip_keys: - - cdt_name - docker_image -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml b/.ci_support/osx_64_python3.6.____cpython.yaml similarity index 80% rename from .ci_support/osx_64_numpy1.17python3.6.____cpython.yaml rename to .ci_support/osx_64_python3.6.____cpython.yaml index 9ca0801..64b4090 100644 --- a/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml +++ b/.ci_support/osx_64_python3.6.____cpython.yaml @@ -5,13 +5,11 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- pytorch,conda-forge,defaults channel_targets: - conda-forge main macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.17' pin_run_as_build: python: min_pin: x.x @@ -20,6 +18,3 @@ python: - 3.6.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.17python3.7.____cpython.yaml b/.ci_support/osx_64_python3.7.____cpython.yaml similarity index 80% rename from .ci_support/osx_64_numpy1.17python3.7.____cpython.yaml rename to .ci_support/osx_64_python3.7.____cpython.yaml index 1928600..d437102 100644 --- a/.ci_support/osx_64_numpy1.17python3.7.____cpython.yaml +++ b/.ci_support/osx_64_python3.7.____cpython.yaml @@ -5,13 +5,11 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- pytorch,conda-forge,defaults channel_targets: - conda-forge main macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.17' pin_run_as_build: python: min_pin: x.x @@ -20,6 +18,3 @@ python: - 3.7.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml similarity index 80% rename from .ci_support/osx_64_numpy1.17python3.8.____cpython.yaml rename to .ci_support/osx_64_python3.8.____cpython.yaml index e5a52d6..dcec2c2 100644 --- a/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -5,13 +5,11 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- pytorch,conda-forge,defaults channel_targets: - conda-forge main macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.17' pin_run_as_build: python: min_pin: x.x @@ -20,6 +18,3 @@ python: - 3.8.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml similarity index 80% rename from .ci_support/osx_64_numpy1.19python3.9.____cpython.yaml rename to .ci_support/osx_64_python3.9.____cpython.yaml index e638a1b..8c416e4 100644 --- a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -5,13 +5,11 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- pytorch,conda-forge,defaults channel_targets: - conda-forge main macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.19' pin_run_as_build: python: min_pin: x.x @@ -20,6 +18,3 @@ python: - 3.9.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_python3.6.____cpython.yaml b/.ci_support/win_64_python3.6.____cpython.yaml new file mode 100644 index 0000000..6f5f2d1 --- /dev/null +++ b/.ci_support/win_64_python3.6.____cpython.yaml @@ -0,0 +1,14 @@ +c_compiler: +- vs2017 +channel_sources: +- pytorch,conda-forge,defaults +channel_targets: +- conda-forge main +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.6.* *_cpython +target_platform: +- win-64 diff --git a/.ci_support/win_64_python3.7.____cpython.yaml b/.ci_support/win_64_python3.7.____cpython.yaml new file mode 100644 index 0000000..d53416d --- /dev/null +++ b/.ci_support/win_64_python3.7.____cpython.yaml @@ -0,0 +1,14 @@ +c_compiler: +- vs2017 +channel_sources: +- pytorch,conda-forge,defaults +channel_targets: +- conda-forge main +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.7.* *_cpython +target_platform: +- win-64 diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml new file mode 100644 index 0000000..a7d9ccd --- /dev/null +++ b/.ci_support/win_64_python3.8.____cpython.yaml @@ -0,0 +1,14 @@ +c_compiler: +- vs2017 +channel_sources: +- pytorch,conda-forge,defaults +channel_targets: +- conda-forge main +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +target_platform: +- win-64 diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml new file mode 100644 index 0000000..b006afc --- /dev/null +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -0,0 +1,14 @@ +c_compiler: +- vs2017 +channel_sources: +- pytorch,conda-forge,defaults +channel_targets: +- conda-forge main +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +target_platform: +- win-64 diff --git a/README.md b/README.md index d9c01f3..689392a 100644 --- a/README.md +++ b/README.md @@ -32,59 +32,87 @@ Current build status - + - + - + - + - + - + - + - + + + + + + + + + + + + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33a441c..6b346f5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,4 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file diff --git a/conda-forge.yml b/conda-forge.yml index 09afeac..20a6b75 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,3 +1,4 @@ conda_forge_output_validation: true os_version: linux_64: cos7 +channel_priority: flexible diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..f47abed --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,2 @@ +channel_sources: + - pytorch,conda-forge,defaults diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8f469f9..7b3ab2c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,9 +11,8 @@ source: sha256: e18d822b735cdd61b710057c4e08c49fd534fb90484a53ab151b0ea6cf3d4d6a build: - number: 0 + number: 1 script: {{ PYTHON }} -m pip install . -vv - skip: true # [win] requirements: build: @@ -23,15 +22,15 @@ requirements: - pip - python - setuptools >=18.0 - - numpy + - numpy >=1.17.5 run: - matplotlib-base - {{ pin_compatible('numpy') }} - pynndescent - python - scipy - - pytorch - - torchvision + - pytorch >=1.7.1 + - torchvision >=0.8.2 - requests test:
VariantStatus
linux_64_numpy1.17python3.6.____cpythonlinux_64_python3.6.____cpython - variant + variant
linux_64_numpy1.17python3.7.____cpythonlinux_64_python3.7.____cpython - variant + variant
linux_64_numpy1.17python3.8.____cpythonlinux_64_python3.8.____cpython - variant + variant
linux_64_numpy1.19python3.9.____cpythonlinux_64_python3.9.____cpython - variant + variant
osx_64_numpy1.17python3.6.____cpythonosx_64_python3.6.____cpython - variant + variant
osx_64_numpy1.17python3.7.____cpythonosx_64_python3.7.____cpython - variant + variant
osx_64_numpy1.17python3.8.____cpythonosx_64_python3.8.____cpython - variant + variant
osx_64_numpy1.19python3.9.____cpythonosx_64_python3.9.____cpython - variant + variant + +
win_64_python3.6.____cpython + + variant + +
win_64_python3.7.____cpython + + variant + +
win_64_python3.8.____cpython + + variant + +
win_64_python3.9.____cpython + + variant