commit b3589b04fd371cbaba7673cec538d3f37576d413
author Bruno Alexandre Rosa <bruno.rosa@eldorado.org.br> Wed Jul 05 01:25:39 2017 -0300
committer Soumith Chintala <soumith@gmail.com> Wed Jul 05 00:25:39 2017 -0400
tree 17a785da3f3a2d25f9e55874169f287b3fd36350
parent 5964394a4ce2131d60cd2f01dd0e098ac3dcb923

Fix exceptions not being caught (#1948)

Adding -fexceptions to both torch and pytorch C/C++ builds fixes tests
not passing.

Closes #1297

torch/lib/build_all.sh

diff --git a/torch/lib/build_all.sh b/torch/lib/build_all.sh
index 1887768..fd24ab0 100755
--- a/torch/lib/build_all.sh
+++ b/torch/lib/build_all.sh
@@ -49,11 +49,16 @@
   # contain the cmake output
   mkdir -p build/$1
   cd build/$1
+  BUILD_C_FLAGS=''
+  case $1 in
+      THCS | THCUNN ) BUILD_C_FLAGS=$C_FLAGS;;
+      *) BUILD_C_FLAGS=$C_FLAGS" -fexceptions";;
+  esac
   cmake ../../$1 -DCMAKE_MODULE_PATH="$BASE_DIR/cmake/FindCUDA" \
               -DTorch_FOUND="1" \
               -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \
-              -DCMAKE_C_FLAGS="$C_FLAGS" \
-              -DCMAKE_CXX_FLAGS="$C_FLAGS $CPP_FLAGS" \
+              -DCMAKE_C_FLAGS="$BUILD_C_FLAGS" \
+              -DCMAKE_CXX_FLAGS="$BUILD_C_FLAGS $CPP_FLAGS" \
               -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS" \
               -DCMAKE_SHARED_LINKER_FLAGS="$LDFLAGS" \
               -DCUDA_NVCC_FLAGS="$C_FLAGS" \