Skip to content

Stop passing CMAKE_TOOLCHAIN_FILE, append to CMAKE_FIND_ROOT_PATH #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Stop passing CMAKE_TOOLCHAIN_FILE, append to CMAKE_FIND_ROOT_PATH #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e798c88
Stop passing CMAKE_TOOLCHAIN_FILE, append to CMAKE_FIND_ROOT_PATH
mgorny Nov 18, 2024
f56493a
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.6, and co…
mgorny Nov 18, 2024
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
3 changes: 1 addition & 2 deletions ...c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ numpy:
- '2'
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -68,7 +68,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...lib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ numpy:
- '2'
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -68,7 +68,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...lib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ numpy:
- '2'
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -68,7 +68,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ numpy:
- '2'
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -68,7 +68,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ numpy:
- '2'
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -68,7 +68,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...lib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ numpy:
- '2'
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -68,7 +68,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...lib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ numpy:
- '2'
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -68,7 +68,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ numpy:
- '2'
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -68,7 +68,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...lib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ numpy:
- '2'
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -72,7 +72,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...lib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ numpy:
- '2'
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -72,7 +72,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ numpy:
- '2'
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -72,7 +72,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implgenericnumpy2.0python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ mkl:
numpy:
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implgenericnumpy2.0python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ mkl:
numpy:
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implgenericnumpy2.0python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ mkl:
numpy:
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implgenericnumpy2.0python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ mkl:
numpy:
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implgenericnumpy2python3.13.____cp313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ mkl:
numpy:
- '2'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ mkl:
numpy:
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ mkl:
numpy:
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ mkl:
numpy:
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ mkl:
numpy:
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implmklnumpy2python3.13.____cp313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ mkl:
numpy:
- '2'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ mkl:
numpy:
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ mkl:
numpy:
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ mkl:
numpy:
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ mkl:
numpy:
- '2.0'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy2python3.13.____cp313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ mkl:
numpy:
- '2'
orc:
- 2.0.2
- 2.0.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop

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

1 change: 1 addition & 0 deletions README.md
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ for ARG in $CMAKE_ARGS; do
export ${cmake_arg}
fi
done
CMAKE_FIND_ROOT_PATH+=";$SRC_DIR"
unset CMAKE_INSTALL_PREFIX
export TH_BINARY_BUILD=1
export PYTORCH_BUILD_VERSION=$PKG_VERSION
Expand Down Expand Up @@ -205,7 +206,6 @@ else
# for CPU builds. Not to be confused with MKL.
export USE_MKLDNN=1
export USE_CUDA=0
export CMAKE_TOOLCHAIN_FILE="${RECIPE_DIR}/cross-linux.cmake"
fi

echo '${CXX}'=${CXX}
Expand Down
22 changes: 0 additions & 22 deletions recipe/cross-linux.cmake
View file
Open in desktop

This file was deleted.

Loading