Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
fmt:
- '12.0'
- '12.1'
github_actions_labels:
- cirun-openstack-gpu-2xlarge
is_rc:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
fmt:
- '12.0'
- '12.1'
github_actions_labels:
- cirun-openstack-gpu-2xlarge
is_rc:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
fmt:
- '12.0'
- '12.1'
github_actions_labels:
- cirun-openstack-gpu-2xlarge
is_rc:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
fmt:
- '12.0'
- '12.1'
github_actions_labels:
- cirun-openstack-gpu-2xlarge
is_rc:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
fmt:
- '12.0'
- '12.1'
github_actions_labels:
- cirun-openstack-gpu-2xlarge
is_rc:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
fmt:
- '12.0'
- '12.1'
github_actions_labels:
- cirun-openstack-gpu-2xlarge
is_rc:
Expand Down
10 changes: 10 additions & 0 deletions .ci_support/migrations/fmt121_spdlog117.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
__migrator:
build_number: 1
commit_message: Rebuild for fmt 12.1 and spdlog 1.17
kind: version
migration_number: 1
migrator_ts: 1767674179.1402016
fmt:
- '12.1'
spdlog:
- '1.17'
10 changes: 0 additions & 10 deletions .ci_support/migrations/fmt12_spdlog116.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cxx_compiler:
cxx_compiler_version:
- '19'
fmt:
- '12.0'
- '12.1'
github_actions_labels:
- cirun-macos-m4-large
is_rc:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cxx_compiler:
cxx_compiler_version:
- '19'
fmt:
- '12.0'
- '12.1'
github_actions_labels:
- cirun-macos-m4-large
is_rc:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cxx_compiler:
cxx_compiler_version:
- '19'
fmt:
- '12.0'
- '12.1'
github_actions_labels:
- cirun-macos-m4-large
is_rc:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cudnn:
cxx_compiler:
- vs2022
fmt:
- '12.0'
- '12.1'
github_actions_labels:
- cirun-azure-windows-4xlarge
is_rc:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cudnn:
cxx_compiler:
- vs2022
fmt:
- '12.0'
- '12.1'
github_actions_labels:
- cirun-azure-windows-4xlarge
is_rc:
Expand Down
20 changes: 18 additions & 2 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,11 @@ case ${PKG_NAME} in
for f in bin/* lib/* share/* include/*; do
if [[ -e "$PREFIX/$f" ]]; then
rm -rf $f
ln -sf $PREFIX/$f $PWD/$f
# do not symlink include files back
# https://github.com/conda-forge/pytorch-cpu-feedstock/issues/447#issuecomment-3712968499
if [[ ${f} != include/* ]]; then
ln -sf $PREFIX/$f $PWD/$f
fi
fi
done
popd
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# if you wish to build release candidate number X, append the version string with ".rcX"
{% set version = "2.9.1" %}
{% set build = 1 %}
{% set build = 2 %}

# Use a higher build number for the CUDA variant, to ensure that it's
# preferred by conda's solver, and it's preferentially
Expand Down