Skip to content

Commit

Permalink
Undo gcc-12 instead of gcc-11.
Browse files Browse the repository at this point in the history
  • Loading branch information
ssheorey committed Sep 29, 2024
1 parent 1bb4602 commit 1d1aeb1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 13 deletions.
3 changes: 2 additions & 1 deletion 3rdparty/find_dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1363,6 +1363,7 @@ if(BUILD_GUI)
llvm-8/lib
llvm-7/lib
)
file(REAL_PATH ${CPPABI_LIBRARY} CPPABI_LIBRARY)
get_filename_component(CLANG_LIBDIR ${CPPABI_LIBRARY} DIRECTORY)
string(REGEX MATCH "llvm-([0-9]+)/lib" _ ${CLANG_LIBDIR})
set(LIBCPP_VERSION ${CMAKE_MATCH_1})
Expand All @@ -1384,7 +1385,7 @@ if(BUILD_GUI)
if (LIBCPP_VERSION GREATER 11)
message(WARNING "libc++ (LLVM) version ${LIBCPP_VERSION} > 11 includes libunwind that "
"interferes with the system libunwind.so.8 and may crash Python code when exceptions "
"are used. Please consider using libc++ v11.")
"are used. Please consider using libc++ (LLVM) v11.")
endif()
endif()
if (APPLE)
Expand Down
7 changes: 0 additions & 7 deletions docker/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ RUN if [ "${BUILD_SYCL_MODULE}" = "ON" ]; then \
fi

# Dependencies: basic and python-build
# gcc-11 causes a seg fault in tensormap when built in Release mode. Upgrade to
# gcc-12 instead.
RUN apt-get update && apt-get install -y \
git \
wget \
Expand All @@ -89,11 +87,6 @@ RUN apt-get update && apt-get install -y \
libxmlsec1-dev \
libffi-dev \
liblzma-dev \
&& if c++ --version | grep -F ' 11.' ; then \
apt-get install -y g++-12 \
&& update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-12 100 \
&& c++ --version; \
fi \
&& rm -rf /var/lib/apt/lists/*

# pyenv or Intel Python
Expand Down
8 changes: 3 additions & 5 deletions util/install_deps_ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,22 @@ eval $(
echo DISTRIB_ID="$DISTRIB_ID";
echo DISTRIB_RELEASE="$DISTRIB_RELEASE"
)
# To avoid dependence on libunwind, we don't want to use clang / libc++ versions later than 11.
# Ubuntu 20.04's has versions 8, 10 or 12 while Ubuntu 22.04 has versions 11 and later.
if [ "$DISTRIB_ID" == "Ubuntu" -a "$DISTRIB_RELEASE" == "20.04" ]; then
# To avoid dependence on libunwind, we don't want to use clang / libc++ versions later than 11.
# Ubuntu 20.04's has versions 8, 10 or 12 while Ubuntu 22.04 has versions 11 and later.
deps=("${deps[@]/clang/clang-10}")
deps=("${deps[@]/libc++-dev/libc++-10-dev}")
deps=("${deps[@]/libc++abi-dev/libc++abi-10-dev}")
fi
if [ "$DISTRIB_ID" == "Ubuntu" -a "$DISTRIB_RELEASE" == "22.04" ]; then
# To avoid dependence on libunwind, we don't want to use clang / libc++ versions later than 11.
# Ubuntu 20.04's has versions 8, 10 or 12 while Ubuntu 22.04 has versions 11 and later.
deps=("${deps[@]/clang/clang-11}")
deps=("${deps[@]/libc++-dev/libc++-11-dev}")
deps=("${deps[@]/libc++abi-dev/libc++abi-11-dev}")
fi

# Special case for ARM64
if [ "$(uname -m)" == "aarch64" ]; then
# For compling LAPACK in OpenBLAS
# For compiling LAPACK in OpenBLAS
deps+=("gfortran")
fi

Expand Down

0 comments on commit 1d1aeb1

Please sign in to comment.