diff --git a/.github/workflows/Tests.yaml b/.github/workflows/Tests.yaml index 107a36156b0fd..79f3dcffb41e3 100644 --- a/.github/workflows/Tests.yaml +++ b/.github/workflows/Tests.yaml @@ -856,8 +856,7 @@ ${{ matrix.build_type }}-pch-${{ matrix.use_pch || 'ON' }}" # listed in support/DevEnvironments/spack.yaml. This list is only needed # to create the cache. SPECTRE_SPACK_DEPS: >- - blaze brigand charmpp gsl hdf5 libsharp libxsmm openblas - py-pybind11 yaml-cpp + blaze charmpp gsl hdf5 libxsmm openblas py-pybind11 yaml-cpp CCACHE_DIR: $HOME/ccache CCACHE_TEMPDIR: $HOME/ccache-tmp CCACHE_MAXSIZE: "2G" diff --git a/containers/Dockerfile.buildenv b/containers/Dockerfile.buildenv index 022492a6e4b4f..cea8bb10b9706 100644 --- a/containers/Dockerfile.buildenv +++ b/containers/Dockerfile.buildenv @@ -196,10 +196,6 @@ RUN wget https://bitbucket.org/blaze-lib/blaze/downloads/blaze-3.8.tar.gz -O bla && mv blaze-* blaze \ && mv blaze/blaze /usr/local/include \ && rm -rf blaze* -# - Brigand -RUN git clone https://github.com/edouarda/brigand.git \ - && mv brigand/include/brigand /usr/local/include \ - && rm -rf brigand # - Catch2 RUN wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.4.0.tar.gz -O catch.tar.gz \ && tar -xzf catch.tar.gz && rm catch.tar.gz \ @@ -220,21 +216,6 @@ RUN git clone https://github.com/ianlancetaylor/libbacktrace \ && ./configure --prefix=/usr/local \ && make $PARALLEL_MAKE_ARG install \ && cd .. && rm -rf libbacktrace -# - Libsharp -RUN wget https://github.com/Libsharp/libsharp/archive/v1.0.0.tar.gz -O libsharp.tar.gz \ - && tar -xzf libsharp.tar.gz \ - && mv libsharp-* libsharp_build \ - && cd libsharp_build \ - && { if [ "$TARGETARCH" != "arm64" ]; \ - then sed -i 's/march=native/march=x86-64/' configure.ac; fi } \ - && autoconf \ - && ./configure --prefix=/usr/local --enable-pic --disable-openmp \ - && make $PARALLEL_MAKE_ARG \ - && mv auto/bin/* /usr/local/bin \ - && mv auto/include/* /usr/local/include \ - && mv auto/lib/* /usr/local/lib \ - && cd ../ \ - && rm -r libsharp* # - LibXSMM RUN if [ "$TARGETARCH" = "arm64" ] ; then \ git clone --single-branch --branch main --depth 1 \ diff --git a/docs/Installation/Installation.md b/docs/Installation/Installation.md index 4395fa6fc9db6..7aafce6663cd7 100644 --- a/docs/Installation/Installation.md +++ b/docs/Installation/Installation.md @@ -137,7 +137,7 @@ apt), or AppleClang 13.0.0 or later #### Bundled: * [Brigand](https://github.com/edouarda/brigand) -* [libsharp](https://github.com/Libsharp/libsharp) +* [libsharp](https://github.com/Libsharp/libsharp) \cite Libsharp ## Clone the SpECTRE repository diff --git a/docs/Installation/InstallationOnAppleSilicon.md b/docs/Installation/InstallationOnAppleSilicon.md index d7b720247eacb..6c375e7230a74 100644 --- a/docs/Installation/InstallationOnAppleSilicon.md +++ b/docs/Installation/InstallationOnAppleSilicon.md @@ -99,28 +99,11 @@ tar -xf blaze-3.8.tar.gz mv blaze-3.8 include popd -git clone https://github.com/edouarda/brigand.git - # Need master branch of libxsmm to support Apple Silicon git clone https://github.com/hfp/libxsmm.git pushd libxsmm make popd - -pushd ./src -git clone https://github.com/Libsharp/libsharp.git -cd libsharp - -# Do not use compiler flag -march=native (unsupported on Apple Silicon) -sed "s/-march=native//" configure.ac > configure.ac.mod -mv configure.ac.mod configure.ac - -autoupdate -autoconf -./configure -make -mv auto $SPECTRE_DEPS_ROOT/libsharp -popd ``` Next, clone, patch, and install charm++ v7.0.0. @@ -149,10 +132,8 @@ spack external find python # Install dependencies spack install \ blaze@3.8.2 \ - brigand@master \ charmpp@7.0.0: backend=multicore \ - libxsmm@main \ - libsharp~mpi~openmp + libxsmm@main ``` ### 5. Configure and build SpECTRE @@ -179,9 +160,7 @@ cmake \ -D CHARM_ROOT=${SPECTRE_DEPS_ROOT}/charm/multicore-darwin-arm8 \ -D SPECTRE_TEST_TIMEOUT_FACTOR=5 \ -D LIBXSMM_ROOT=${SPECTRE_DEPS_ROOT}/libxsmm/ \ --D BLAZE_ROOT=${SPECTRE_DEPS_ROOT}/blaze/ \ --D BRIGAND_ROOT=${SPECTRE_DEPS_ROOT}/brigand/ \ --D LIBSHARP_ROOT=${SPECTRE_DEPS_ROOT}/libsharp/ \ +-D BLAZE_ROOT=${SPECTRE_DEPS_ROOT}/blaze/ .. ``` diff --git a/support/DevEnvironments/spack.yaml b/support/DevEnvironments/spack.yaml index 083c45661a94b..a8383d4a9793b 100644 --- a/support/DevEnvironments/spack.yaml +++ b/support/DevEnvironments/spack.yaml @@ -44,7 +44,6 @@ spack: specs: - blaze@3.8 - 'boost@1.60:+math+program_options' - - brigand@master - 'catch2@3.4.0:3' # Charm++: # - The 'multicore' backend runs with shared memory on a single node. On @@ -55,7 +54,6 @@ spack: - gsl - hdf5 -mpi - jemalloc - - libsharp -mpi -openmp - 'libxsmm@1.16.1:' - openblas - 'python@3.8:'