frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-11-03 23:45:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixing conda builds by removing unneeded python args (#7384)

Browse Source
This commit is contained in:
Paul Jesse Hellemn
2018-05-08 17:33:30 -07:00
committed by GitHub
parent 3913e9ead3
commit dc3252730e
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
conda/caffe2/normal/build.sh
View File

@ -18,8 +18,6 @@ set -ex
echo "Installing caffe2 to ${PREFIX}" echo "Installing caffe2 to ${PREFIX}"
python_args="$(python ./scripts/get_python_cmake_flags.py)"
# Install under specified prefix # Install under specified prefix
cmake_args=() cmake_args=()
cmake_args+=("-DCMAKE_INSTALL_PREFIX=$PREFIX") cmake_args+=("-DCMAKE_INSTALL_PREFIX=$PREFIX")
@ -28,7 +26,7 @@ cmake_args+=("-DCMAKE_PREFIX_PATH=$PREFIX")
# Build Caffe2 # Build Caffe2
mkdir -p build mkdir -p build
cd build cd build
cmake "${cmake_args[@]}" "$python_args" $CAFFE2_CMAKE_ARGS .. cmake "${cmake_args[@]}" $CAFFE2_CMAKE_ARGS ..
if [ "$(uname)" == 'Darwin' ]; then if [ "$(uname)" == 'Darwin' ]; then
make "-j$(sysctl -n hw.ncpu)" make "-j$(sysctl -n hw.ncpu)"
else else

3
conda/integrated/build.sh
View File

@ -51,13 +51,12 @@ fi
########################################################### ###########################################################
# Build Caffe2 # Build Caffe2
########################################################### ###########################################################
python_args="$(python ./scripts/get_python_cmake_flags.py)"
cmake_args=() cmake_args=()
cmake_args+=("-DCMAKE_INSTALL_PREFIX=$PREFIX") cmake_args+=("-DCMAKE_INSTALL_PREFIX=$PREFIX")
# Build Caffe2 # Build Caffe2
mkdir -p caffe2_build && pushd caffe2_build mkdir -p caffe2_build && pushd caffe2_build
cmake "${cmake_args[@]}" "$python_args" $CAFFE2_CMAKE_ARGS .. cmake "${cmake_args[@]}" $CAFFE2_CMAKE_ARGS ..
if [ "$(uname)" == 'Darwin' ]; then if [ "$(uname)" == 'Darwin' ]; then
make "-j$(sysctl -n hw.ncpu)" make "-j$(sysctl -n hw.ncpu)"
else else