Skip to content

Commit

Permalink
support cuda 12, rerender build (#29)
Browse files Browse the repository at this point in the history
* change build config

* MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.29.0, and conda-forge-pinning 2023.11.18.11.24.55

* commit config

* updates for cuda12

* back to tex3D

* bump version

* rerender

* undo

* comment out camcor stuff

* export path

* fix path

* try remove find_package cuda

* undo cmake changes

* pin cmake

* rerender

* update cmake

* revert

* update cmake with find cudatoolkit

* change lib strategy

* MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.15.13.31.46

* add include

* drop cuda 11.2 on windows
  • Loading branch information
tlambert03 authored Jul 15, 2024
1 parent e822f75 commit 21f7a80
Show file tree
Hide file tree
Showing 26 changed files with 359 additions and 430 deletions.
23 changes: 9 additions & 14 deletions .azure-pipelines/azure-pipelines-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,20 @@ jobs:
vmImage: ubuntu-latest
strategy:
matrix:
linux_64_cuda_compiler_version10.2:
CONFIG: linux_64_cuda_compiler_version10.2
linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0:
CONFIG: linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0
UPLOAD_PACKAGES: 'False'
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:10.2
linux_64_cuda_compiler_version11.2:
CONFIG: linux_64_cuda_compiler_version11.2
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
linux_64_cuda_compilernvcccuda_compiler_version11.2:
CONFIG: linux_64_cuda_compilernvcccuda_compiler_version11.2
UPLOAD_PACKAGES: 'False'
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2
linux_64_cuda_compiler_version9.2:
CONFIG: linux_64_cuda_compiler_version9.2
UPLOAD_PACKAGES: 'False'
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:9.2
timeoutInMinutes: 360
variables: {}

steps:
- checkout: self
fetchDepth: 0
- 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: |
Expand All @@ -40,6 +32,9 @@ jobs:
- script: |
export CI=azure
export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt)
export remote_url=$(Build.Repository.Uri)
export sha=$(Build.SourceVersion)
export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME
export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME})
if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then
Expand Down
64 changes: 15 additions & 49 deletions .azure-pipelines/azure-pipelines-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,21 @@
jobs:
- job: win
pool:
vmImage: windows-2019
vmImage: windows-2022
strategy:
matrix:
win_64_cuda_compiler_version10.2:
CONFIG: win_64_cuda_compiler_version10.2
UPLOAD_PACKAGES: 'False'
win_64_cuda_compiler_version11.0:
CONFIG: win_64_cuda_compiler_version11.0
UPLOAD_PACKAGES: 'False'
win_64_cuda_compiler_version11.1:
CONFIG: win_64_cuda_compiler_version11.1
UPLOAD_PACKAGES: 'False'
win_64_cuda_compiler_version11.2:
CONFIG: win_64_cuda_compiler_version11.2
win_64_:
CONFIG: win_64_
UPLOAD_PACKAGES: 'False'
timeoutInMinutes: 360
variables:
CONDA_BLD_PATH: D:\\bld\\
UPLOAD_TEMP: D:\\tmp

steps:
- checkout: self
fetchDepth: 0

- task: PythonScript@0
displayName: 'Download Miniforge'
inputs:
Expand All @@ -45,42 +38,15 @@ jobs:
displayName: Add conda to PATH

- script: |
call activate base
mamba.exe install "python=3.9" conda-build conda pip conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes
displayName: Install conda-build
- 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
- script: |
call activate base
if EXIST LICENSE.txt (
copy LICENSE.txt "recipe\\recipe-scripts-license.txt"
)
conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables
displayName: Build recipe
call ".scripts\run_win_build.bat"
displayName: Run Windows build
env:
PYTHONUNBUFFERED: 1
- 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')), not(eq(variables['Build.Reason'], 'PullRequest')))
CONFIG: $(CONFIG)
CI: azure
flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt)
remote_url: $(Build.Repository.Uri)
sha: $(Build.SourceVersion)
UPLOAD_PACKAGES: $(UPLOAD_PACKAGES)
UPLOAD_TEMP: $(UPLOAD_TEMP)
BINSTAR_TOKEN: $(BINSTAR_TOKEN)
37 changes: 0 additions & 37 deletions .ci_support/linux_64_cuda_compiler_version9.2.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,37 +1,35 @@
boost_cpp:
- 1.78.0
c_compiler:
- gcc
c_compiler_version:
- '7'
- '10'
cdt_name:
- cos7
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- cuda-nvcc
cuda_compiler_version:
- '10.2'
- '12.0'
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-cuda:10.2
- quay.io/condaforge/linux-anvil-cos7-x86_64
fftw:
- '3'
libboost_devel:
- '1.82'
libtiff:
- '4'
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
- '4.6'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
boost_cpp:
- 1.78.0
c_compiler:
- gcc
c_compiler_version:
- '7'
- '10'
cdt_name:
- cos7
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand All @@ -17,21 +15,21 @@ cuda_compiler_version:
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-cuda:11.2
fftw:
- '3'
libboost_devel:
- '1.82'
libtiff:
- '4'
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
- '4.6'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
boost_cpp:
- 1.78.0
c_compiler:
- vs2019
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- cuda-nvcc
cuda_compiler_version:
- '11.0'
- '12.0'
cxx_compiler:
- vs2019
fftw:
- '3'
libboost_devel:
- '1.82'
libtiff:
- '4'
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
- '4.6'
target_platform:
- win-64
zip_keys:
- - cuda_compiler
- cuda_compiler_version
23 changes: 0 additions & 23 deletions .ci_support/win_64_cuda_compiler_version10.2.yaml

This file was deleted.

23 changes: 0 additions & 23 deletions .ci_support/win_64_cuda_compiler_version11.1.yaml

This file was deleted.

23 changes: 0 additions & 23 deletions .ci_support/win_64_cuda_compiler_version11.2.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ jobs:
runs-on: ubuntu-latest
name: automerge
steps:
- name: checkout
uses: actions/checkout@v3
- name: automerge-action
id: automerge-action
uses: conda-forge/automerge-action@main
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ VS/cudaDeconv.vcxproj.filters

build_artifacts
# conda smithy ci-skeleton end
cmake_build
Loading

0 comments on commit 21f7a80

Please sign in to comment.