Skip to content

Commit

Permalink
Merge pull request #111 from prism-em/dev
Browse files Browse the repository at this point in the history
Merge 2.0 dev into master for release.
  • Loading branch information
lerandc authored Oct 11, 2021
2 parents c0f23b5 + f240e06 commit 2470f58
Show file tree
Hide file tree
Showing 301 changed files with 116,384 additions and 8,566 deletions.
54 changes: 54 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# 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: linux
pool:
vmImage: ubuntu-16.04
strategy:
matrix:
linux_64_c_compiler_version7cuda_compiler_version10.0cxx_compiler_version7:
CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.0cxx_compiler_version7
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.0
linux_64_c_compiler_version7cuda_compiler_version10.1cxx_compiler_version7:
CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.1cxx_compiler_version7
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.1
linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7:
CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.2
linux_64_c_compiler_version7cuda_compiler_version9.2cxx_compiler_version7:
CONFIG: linux_64_c_compiler_version7cuda_compiler_version9.2cxx_compiler_version7
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: condaforge/linux-anvil-cuda:9.2
linux_64_c_compiler_version7cuda_compiler_versionNonecxx_compiler_version7:
CONFIG: linux_64_c_compiler_version7cuda_compiler_versionNonecxx_compiler_version7
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: condaforge/linux-anvil-comp7
timeoutInMinutes: 360

steps:
- script: |
rm -rf /opt/ghc
df -h
displayName: Manage disk space
# configure qemu binfmt-misc running. This allows us to run docker containers
# embedded qemu-static
- script: |
docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
ls /proc/sys/fs/binfmt_misc/
condition: not(startsWith(variables['CONFIG'], 'linux_64'))
displayName: Configure binfmt_misc
- script: |
export CI=azure
export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME
export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME})
.scripts/run_docker_build.sh
displayName: Run docker build
env:
BINSTAR_TOKEN: $(BINSTAR_TOKEN)
26 changes: 26 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# 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-10.15
strategy:
matrix:
osx_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10:
CONFIG: osx_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10
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})
./.scripts/run_osx_build.sh
displayName: Run OSX build
env:
BINSTAR_TOKEN: $(BINSTAR_TOKEN)
103 changes: 103 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
# 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_cuda_compiler_versionNone:
CONFIG: win_64_cuda_compiler_versionNone
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 "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%"
set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%"
call activate base
upload_package .\ ".\recipe" .ci_support\%CONFIG%.yaml
displayName: Upload package
env:
BINSTAR_TOKEN: $(BINSTAR_TOKEN)
condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')))
1 change: 1 addition & 0 deletions .ci_support/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This file is automatically generated by conda-smithy. To change any matrix elements, you should change conda-smithy's input conda_build_config.yaml and re-render the recipe, rather than editing these files directly.
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
boost:
- 1.72.0
boost_cpp:
- 1.72.0
c_compiler:
- gcc
c_compiler_version:
- '7'
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '10.0'
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
docker_image:
- condaforge/linux-anvil-cuda:10.0
fftw:
- '3'
hdf5:
- 1.10.5
pin_run_as_build:
boost:
max_pin: x.x.x
boost-cpp:
max_pin: x.x.x
fftw:
max_pin: x
python:
min_pin: x.x
max_pin: x.x
qt:
max_pin: x.x
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
qt:
- '5.12'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cuda_compiler_version
- docker_image
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
boost:
- 1.72.0
boost_cpp:
- 1.72.0
c_compiler:
- gcc
c_compiler_version:
- '7'
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '10.1'
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
docker_image:
- condaforge/linux-anvil-cuda:10.1
fftw:
- '3'
hdf5:
- 1.10.5
pin_run_as_build:
boost:
max_pin: x.x.x
boost-cpp:
max_pin: x.x.x
fftw:
max_pin: x
python:
min_pin: x.x
max_pin: x.x
qt:
max_pin: x.x
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
qt:
- '5.12'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cuda_compiler_version
- docker_image
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
boost:
- 1.72.0
boost_cpp:
- 1.72.0
c_compiler:
- gcc
c_compiler_version:
- '7'
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '10.2'
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
docker_image:
- condaforge/linux-anvil-cuda:10.2
fftw:
- '3'
hdf5:
- 1.10.5
pin_run_as_build:
boost:
max_pin: x.x.x
boost-cpp:
max_pin: x.x.x
fftw:
max_pin: x
python:
min_pin: x.x
max_pin: x.x
qt:
max_pin: x.x
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
qt:
- '5.12'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cuda_compiler_version
- docker_image
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
boost:
- 1.72.0
boost_cpp:
- 1.72.0
c_compiler:
- gcc
c_compiler_version:
- '7'
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '9.2'
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
docker_image:
- condaforge/linux-anvil-cuda:9.2
fftw:
- '3'
hdf5:
- 1.10.5
pin_run_as_build:
boost:
max_pin: x.x.x
boost-cpp:
max_pin: x.x.x
fftw:
max_pin: x
python:
min_pin: x.x
max_pin: x.x
qt:
max_pin: x.x
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
qt:
- '5.12'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cuda_compiler_version
- docker_image
Loading

0 comments on commit 2470f58

Please sign in to comment.