diff --git a/Docker/github_ci_dockerfile b/Docker/github_ci_dockerfile index abdde0ae..af0bc870 100644 --- a/Docker/github_ci_dockerfile +++ b/Docker/github_ci_dockerfile @@ -99,43 +99,43 @@ ENV CPATH=/triqs/include:${CPATH} \ CTEST_PARALLEL_LEVEL=${NCORES} \ TRIQS_ROOT=/triqs -RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/triqs \ +RUN cd /source && git clone -b 3.3.x --depth 1 https://github.com/TRIQS/triqs \ && cd triqs && mkdir -p build && cd build \ && cmake ../ -DCMAKE_INSTALL_PREFIX=/triqs \ && make -j$NCORES && ctest -j$NCORES && make install # dft_tools -RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/dft_tools.git \ +RUN cd /source && git clone -b 3.3.x --depth 1 https://github.com/TRIQS/dft_tools.git \ && cd dft_tools && mkdir -p build && cd build \ && cmake ../ \ && make -j$NCORES && ctest -j$NCORES && make install # cthyb -RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/cthyb.git \ +RUN cd /source && git clone -b 3.3.x --depth 1 https://github.com/TRIQS/cthyb.git \ && cd cthyb && mkdir -p build && cd build \ && cmake ../ \ && make -j$NCORES && ctest -j$NCORES && make install # hubbardI -RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/hubbardI.git \ +RUN cd /source && git clone -b 3.3.x --depth 1 https://github.com/TRIQS/hubbardI.git \ && cd hubbardI && mkdir -p build && cd build \ && cmake ../ \ && make -j$NCORES && ctest -j$NCORES && make install # Hartree-Fock solver -RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/hartree_fock.git \ +RUN cd /source && git clone -b 3.3.x --depth 1 https://github.com/TRIQS/hartree_fock.git \ && cd hartree_fock && mkdir -p build && cd build \ && cmake ../ \ && make -j$NCORES && ctest -j$NCORES && make install # maxent needed for doc build -RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/maxent.git \ +RUN cd /source && git clone -b 3.3.x --depth 1 https://github.com/TRIQS/maxent.git \ && cd maxent && mkdir -p build && cd build \ && cmake ../ \ && make -j$NCORES && ctest -j$NCORES && make install # install sparse-ir into triqs pythonpath -pip install --target /triqs/lib/python3.10/site-packages sparse-ir[xprec] +RUN pip install --target /triqs/lib/python3.10/site-packages sparse-ir[xprec] # remove source RUN cd / && rm -rf source diff --git a/Docker/openmpi_dockerfile b/Docker/openmpi_dockerfile index 64b5f0c4..3ce9716e 100644 --- a/Docker/openmpi_dockerfile +++ b/Docker/openmpi_dockerfile @@ -105,6 +105,9 @@ RUN mkdir -p /src && cd /src \ # && cd .. \ # && rm -rf openmpi-4.1.5.tar.gz openmpi-4.1.5 +# install sparse-ir into triqs pythonpath +RUN pip install --target /triqs/lib/python3.10/site-packages sparse-ir[xprec] + ENV PYTHON_VERSION=3.10 \ CC=clang-${LLVM} CXX=clang++-${LLVM} CXXFLAGS="-stdlib=libc++" RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${LLVM} 60 --slave /usr/bin/clang++ clang++ /usr/bin/clang++-${LLVM} --slave /usr/bin/clang-cpp clang-cpp /usr/bin/clang-cpp-${LLVM} @@ -183,52 +186,49 @@ ENV CPATH=/triqs/include:/usr/include/mkl:${CPATH} \ BLA_VENDOR=Intel10_64_dyn \ TRIQS_ROOT=/triqs -RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/triqs triqs.src \ +RUN cd /source && git clone -b 3.3.x --depth 1 https://github.com/TRIQS/triqs triqs.src \ && mkdir -p triqs.build && cd triqs.build \ && cmake ../triqs.src -DCMAKE_INSTALL_PREFIX=/triqs \ && make -j$NCORES && ctest -j$NCORES && make install # dft_tools -RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/dft_tools.git dft_tools.src \ +RUN cd /source && git clone -b 3.3.x --depth 1 https://github.com/TRIQS/dft_tools.git dft_tools.src \ && mkdir -p dft_tools.build && cd dft_tools.build \ && cmake ../dft_tools.src \ && make -j$NCORES && ctest -j$NCORES && make install # cthyb -RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/cthyb.git cthyb.src \ +RUN cd /source && git clone -b 3.3.x --depth 1 https://github.com/TRIQS/cthyb.git cthyb.src \ && mkdir -p cthyb.build && cd cthyb.build \ && cmake ../cthyb.src \ && make -j$NCORES && ctest -j$NCORES && make install # maxent -RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/maxent.git maxent.src \ +RUN cd /source && git clone -b 3.3.x --depth 1 https://github.com/TRIQS/maxent.git maxent.src \ && mkdir -p maxent.build && cd maxent.build \ && cmake ../maxent.src \ && make -j$NCORES && ctest -j$NCORES && make install # TPRF -RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/tprf.git tprf.src \ +RUN cd /source && git clone -b 3.3.x --depth 1 https://github.com/TRIQS/tprf.git tprf.src \ && mkdir -p tprf.build && cd tprf.build \ && cmake ../tprf.src \ && make -j$NCORES && make test && make install # hubbardI -RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/hubbardI.git hubbardI.src \ +RUN cd /source && git clone -b 3.3.x --depth 1 https://github.com/TRIQS/hubbardI.git hubbardI.src \ && mkdir -p hubbardI.build && cd hubbardI.build \ && cmake ../hubbardI.src \ && make -j$NCORES && ctest -j$NCORES && make install # hartree_fock -RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/hartree_fock.git hartree_fock.src \ +RUN cd /source && git clone -b 3.3.x --depth 1 https://github.com/TRIQS/hartree_fock.git hartree_fock.src \ && mkdir -p hartree_fock.build && cd hartree_fock.build \ && cmake ../hartree_fock.src \ && make -j$NCORES && ctest -j$NCORES && make install -# install sparse-ir into triqs pythonpath -pip install --target /triqs/lib/python3.10/site-packages sparse-ir[xprec] - # download solid_dmft and install -RUN cd /source && git clone -b unstable --depth 1 https://github.com/flatironinstitute/solid_dmft.git solid_dmft.src \ +RUN cd /source && git clone -b 3.3.x --depth 1 https://github.com/flatironinstitute/solid_dmft.git solid_dmft.src \ && mkdir -p solid_dmft.build && cd solid_dmft.build \ && cmake ../solid_dmft.src \ && make test && make install