Skip to content

Commit

Permalink
Fixing conda builds by removing unneeded python args (#7384)
Browse files Browse the repository at this point in the history
  • Loading branch information
pjh5 authored May 9, 2018
1 parent 3913e9e commit dc32527
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
4 changes: 1 addition & 3 deletions conda/caffe2/normal/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ set -ex

echo "Installing caffe2 to ${PREFIX}"

python_args="$(python ./scripts/get_python_cmake_flags.py)"

# Install under specified prefix
cmake_args=()
cmake_args+=("-DCMAKE_INSTALL_PREFIX=$PREFIX")
Expand All @@ -28,7 +26,7 @@ cmake_args+=("-DCMAKE_PREFIX_PATH=$PREFIX")
# Build Caffe2
mkdir -p build
cd build
cmake "${cmake_args[@]}" "$python_args" $CAFFE2_CMAKE_ARGS ..
cmake "${cmake_args[@]}" $CAFFE2_CMAKE_ARGS ..
if [ "$(uname)" == 'Darwin' ]; then
make "-j$(sysctl -n hw.ncpu)"
else
Expand Down
3 changes: 1 addition & 2 deletions conda/integrated/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,12 @@ fi
###########################################################
# Build Caffe2
###########################################################
python_args="$(python ./scripts/get_python_cmake_flags.py)"
cmake_args=()
cmake_args+=("-DCMAKE_INSTALL_PREFIX=$PREFIX")

# Build Caffe2
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
make "-j$(sysctl -n hw.ncpu)"
else
Expand Down

0 comments on commit dc32527

Please sign in to comment.