From ec357094eba5ec2aea732bc52ba34bf2b2efa583 Mon Sep 17 00:00:00 2001 From: Serg Creevanose Date: Mon, 18 Dec 2023 04:29:49 -0800 Subject: [PATCH] Actualized Docker image before adding FoundationDB there --- .devcontainer/Dockerfile | 54 ++++++++++++++++++++++++---------------- omnn/math/System.h | 1 + 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index d9ee9c39b..66ff65b29 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,5 +1,10 @@ FROM gentoo/stage3:latest +ARG LLVM_MAJOR_VERSION=17 +ARG LLVM_FULL_VERSION=$LLVM_MAJOR_VERSION.0.6 +#ARG BOOST_VERSION=1.82.0-r1 +ARG BOOST_VERSION=1.83.0-r2 + RUN emerge --sync RUN echo 'CFLAGS="-march=native -mtune=native -O3 -pipe"' >> /etc/portage/make.conf @@ -22,8 +27,11 @@ RUN echo "dev-libs/icu **" > /etc/portage/package.accept_keywords/icu RUN echo "dev-lang/mono minimal" > /etc/portage/package.use/mono RUN echo "sys-devel/llvm **" > /etc/portage/package.accept_keywords/llvm +RUN echo "sys-devel/llvm-common **" >> /etc/portage/package.accept_keywords/llvm RUN echo "sys-devel/llvm-toolchain-symlinks **" >> /etc/portage/package.accept_keywords/llvm RUN echo "sys-devel/llvmgold **" >> /etc/portage/package.accept_keywords/llvm +RUN echo "sys-devel/lld **" > /etc/portage/package.accept_keywords/lld +RUN echo "sys-devel/lld-toolchain-symlinks **" >> /etc/portage/package.accept_keywords/lld RUN echo "dev-util/lldb **" > /etc/portage/package.accept_keywords/lldb RUN echo "sys-devel/clang **" > /etc/portage/package.accept_keywords/clang RUN echo "sys-devel/clang-common **" >> /etc/portage/package.accept_keywords/clang @@ -66,27 +74,31 @@ RUN emerge --update \ x11-libs/libXScrnSaver \ -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* -#RUN emerge --update dev-lang/julia -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* - RUN emerge -j`nproc` sys-devel/gcc && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* -RUN emerge -v --onlydeps sys-devel/llvm:18 -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* -RUN emerge -1 sys-devel/llvm:18 -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* -RUN emerge -1u --onlydeps sys-devel/clang:18 -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* -RUN emerge --update sys-devel/clang:18 -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* -#RUN (emerge --update sys-devel/clang:18 -j`nproc` || MAKEOPTS=-j1 emerge --update sys-devel/clang:18 -j1) && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* - -RUN emerge --update =dev-libs/boost-1.82.0-r1 -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* - RUN emerge --update \ - lld \ + bash-completion \ + eix \ -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* -#RUN emerge --update =dev-libs/boost-1.81.0 -j`nproc` +RUN eix-update + +RUN emerge dev-python/sphinx -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* +RUN emerge =sys-devel/llvm-common-$LLVM_FULL_VERSION -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* +RUN emerge --update -j`nproc` \ + sys-libs/binutils-libs \ + dev-python/myst-parser \ + && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* + +RUN emerge sys-devel/llvm:$LLVM_MAJOR_VERSION -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* +RUN emerge --update =sys-libs/libomp-$LLVM_FULL_VERSION -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* +RUN emerge --update =dev-libs/boost-$BOOST_VERSION -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* +RUN emerge --update =sys-devel/clang-common-$LLVM_FULL_VERSION-r1 -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* +RUN emerge --update =sys-devel/lld-$LLVM_FULL_VERSION -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* # FoundationDB deps RUN emerge --update dev-cpp/benchmark dev-cpp/gtest -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* -RUN emerge --update dev-lang/mono -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* +#RUN emerge --update dev-lang/mono -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* RUN emerge --update \ dev-util/intel-ocl-sdk \ @@ -97,17 +109,17 @@ RUN emerge --update \ media-libs/vulkan-loader \ -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* -RUN eix-update - RUN emerge --update gdb -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* -#RUN emerge --update dev-util/lldb -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* +RUN emerge --update =dev-util/lldb-$LLVM_FULL_VERSION -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* + +# RUN emerge --update =dev-lang/julia-1.8.3-r4 -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* +#RUN emerge --update =dev-lang/julia-1.8.5-r1 -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* -#RUN emerge --update =dev-lang/julia-1.8.3-r4 -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* -RUN emerge --update =dev-lang/julia-1.8.5-r1 -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* -# RUN emerge --update \ app-misc/mc \ - bash-completion \ - eix \ sys-process/htop \ -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* + +RUN emerge --update \ + sys-apps/ripgrep \ + -j`nproc` && rm -rf /var/cache/distfiles/* && rm -rf /var/tmp/portage/* diff --git a/omnn/math/System.h b/omnn/math/System.h index 65e14c36d..0ef9c8bd3 100644 --- a/omnn/math/System.h +++ b/omnn/math/System.h @@ -79,6 +79,7 @@ class System // TODO: resolve current problem, it mixes-up conjunction with disj } constexpr const auto& Expressions() const { return equs; } + auto IsEmpty() const { return equs.empty(); } auto& Yarns(const Variable& v) { return vEs[v]; } const auto& Known(const Variable& v) { return Yarns(v)[{}]; }