Skip to content
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

Jump to bottom

Drop -D_GLIBCXX_USE_CXX11_ABI=0 #166

Merged
merged 1 commit into from Sep 3, 2019
Merged

Drop -D_GLIBCXX_USE_CXX11_ABI=0 #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions deps/get-deps.sh
View file
Open in desktop
Expand Up @@ -76,17 +76,17 @@ if [ "$SKIP_DOWNLOAD" = 0 ] ; then
;;
"Linux")
if [ "$USE_NIGHTLY" = 1 ] ; then
wget https://download.pytorch.org/libtorch/nightly/${COMPUTE_ARCH}/libtorch-shared-with-deps-latest.zip
unzip libtorch-shared-with-deps-latest.zip
rm libtorch-shared-with-deps-latest.zip
wget https://download.pytorch.org/libtorch/nightly/${COMPUTE_ARCH}/libtorch-cxx11-abi-shared-with-deps-latest.zip
unzip libtorch-cxx11-abi-shared-with-deps-latest.zip
rm libtorch-cxx11-abi-shared-with-deps-latest.zip
elif [ "$USE_BINARY_FOR_CI" = 1 ] ; then
wget https://github.com/hasktorch/libtorch-binary-for-ci/releases/download/${VERSION}/${COMPUTE_ARCH}-libtorch-shared-with-deps-latest.zip
unzip ${COMPUTE_ARCH}-libtorch-shared-with-deps-latest.zip
rm ${COMPUTE_ARCH}-libtorch-shared-with-deps-latest.zip
wget https://github.com/hasktorch/libtorch-binary-for-ci/releases/download/${VERSION}/${COMPUTE_ARCH}-libtorch-cxx11-abi-shared-with-deps-latest.zip
unzip ${COMPUTE_ARCH}-libtorch-cxx11-abi-shared-with-deps-latest.zip
rm ${COMPUTE_ARCH}-libtorch-cxx11-abi-shared-with-deps-latest.zip
else
wget https://download.pytorch.org/libtorch/${COMPUTE_ARCH}/libtorch-shared-with-deps-${VERSION}.zip
unzip libtorch-shared-with-deps-${VERSION}.zip
rm libtorch-shared-with-deps-${VERSION}.zip
wget https://download.pytorch.org/libtorch/${COMPUTE_ARCH}/libtorch-cxx11-abi-shared-with-deps-${VERSION}.zip
unzip libtorch-cxx11-abi-shared-with-deps-${VERSION}.zip
rm libtorch-cxx11-abi-shared-with-deps-${VERSION}.zip
fi
wget https://github.com/intel/mkl-dnn/releases/download/v0.17.2/mklml_lnx_2019.0.1.20181227.tgz
tar -xzf mklml_lnx_2019.0.1.20181227.tgz
Expand Down
16 changes: 8 additions & 8 deletions libtorch-ffi/libtorch-ffi.cabal
View file
Open in desktop
Expand Up @@ -71,11 +71,11 @@ library
extra-ghci-libraries: stdc++
if os(darwin)
ld-options: -Wl,-keep_dwarf_unwind
ghc-options: -optc-D_GLIBCXX_USE_CXX11_ABI=0 -optc-std=c++11 -optc-xc++
ghc-options: -optc-std=c++11 -optc-xc++
else
ghc-options: -optc-D_GLIBCXX_USE_CXX11_ABI=0 -optc-std=c++11
cc-options: -D_GLIBCXX_USE_CXX11_ABI=0 -std=c++11
cxx-options: -D_GLIBCXX_USE_CXX11_ABI=0 -std=c++11
ghc-options: -optc-std=c++11
cc-options: -std=c++11
cxx-options: -std=c++11
default-extensions: Strict
, StrictData

Expand All @@ -100,10 +100,10 @@ test-suite spec
, safe-exceptions
if os(darwin)
ld-options: -Wl,-keep_dwarf_unwind
ghc-options: -optc-D_GLIBCXX_USE_CXX11_ABI=0 -optc-std=c++11 -optc-xc++
ghc-options: -optc-std=c++11 -optc-xc++
else
ghc-options: -optc-D_GLIBCXX_USE_CXX11_ABI=0 -optc-std=c++11
cc-options: -D_GLIBCXX_USE_CXX11_ABI=0 -std=c++11
cxx-options: -D_GLIBCXX_USE_CXX11_ABI=0 -std=c++11
ghc-options: -optc-std=c++11
cc-options: -std=c++11
cxx-options: -std=c++11
default-extensions: Strict
, StrictData