From 325a2aef0eee3e1c1f92d00bfa27d4d292824f1d Mon Sep 17 00:00:00 2001 From: Germann Elsa Sylvia Date: Fri, 19 Aug 2022 16:58:36 +0200 Subject: [PATCH] FIX: only put /usr packages in packages.yaml and unbuilable pckgs --- env/merlin/sysconfigs/packages.yaml | 134 +++------------------------- 1 file changed, 11 insertions(+), 123 deletions(-) diff --git a/env/merlin/sysconfigs/packages.yaml b/env/merlin/sysconfigs/packages.yaml index 18ff561..6f0ad02 100644 --- a/env/merlin/sysconfigs/packages.yaml +++ b/env/merlin/sysconfigs/packages.yaml @@ -2,12 +2,7 @@ packages: all: compiler: - - gcc@9.5.0 - - gcc@9.3.0 - - intel@2021.6.0 - - oneapi@2022.1.0 - - dpcpp@2022.1.0 - - nvhpc@21.5 + - gcc@12.1.0 permissions: read: user write: user @@ -36,39 +31,21 @@ packages: externals: - prefix: /usr spec: automake@1.13.4 - bash: - externals: - - prefix: /opt/psi/System/bash/5.1.16 - spec: bash@5.1.16 binutils: buildable: false externals: - prefix: /usr spec: binutils@2.27.44 - bison: - externals: - - prefix: /opt/psi/Programming/bison/3.8.2 - spec: bison@3.8.2 bzip2: buildable: false externals: - prefix: /usr spec: bzip2@1.0.6 - cmake: - externals: - - prefix: /opt/psi/Programming/cmake/3.23.2 - spec: cmake@3.23.2 cpio: buildable: false externals: - prefix: /usr spec: cpio@2.11 - cuda: - externals: - - prefix: /opt/psi/Programming/cuda/11.5.1 - spec: cuda@11.5.1%gcc - - prefix: /opt/psi/Compiler/cuda/11.0.3/gcc/9.3.0 - spec: cuda@11.0.3%gcc@9.3.0 curl: buildable: false externals: @@ -108,15 +85,16 @@ packages: externals: - prefix: /usr spec: flex@2.5.37+lex + # E.G: only available from already downloaded source, so I put it here + gams: + externals: + - prefix: /opt/psi/Tools/GAMS/31.1.1/gams31.1_linux_x64_64_sfx + spec: gams@31.1.1 gawk: buildable: false externals: - prefix: /usr spec: gawk@4.0.2 - gcc: - externals: - - prefix: /opt/psi/Programming/gcc/9.5.0 - spec: gcc@9.5.0 ghostscript: buildable: false externals: @@ -142,48 +120,16 @@ packages: externals: - prefix: /usr spec: gmake@3.82 - gmp: - externals: - - prefix: /opt/psi/Libraries/gmp/6.2.1 - spec: gmp@6.2.1 groff: buildable: false externals: - prefix: /usr spec: groff@1.22.2 - hdf5: - externals: - - prefix: /opt/psi/Compiler/hdf5_serial/1.8.21/gcc/8.2.0 - spec: hdf5@1.8.21%gcc@8.2.0 ~mpi +hl +fortran +shared - - prefix: /opt/psi/Compiler/hdf5_serial/1.8.21/intel/18.4 - spec: hdf5@1.8.21%intel@18.4 ~mpi +hl +fortran +shared - - prefix: /opt/psi/Compiler/hdf5_serial/1.8.21/pgi/18.5 - spec: hdf5@1.8.21%nvhpc@18.5 ~mpi +hl +fortran +shared - - prefix: /opt/psi/MPI/hdf5/1.8.20/openmpi/3.1.3/gcc/7.3.0/lib - spec: hdf5@1.8.20%gcc@7.3.0 +mpi +hl +fortran +shared - - prefix: /opt/psi/MPI/hdf5/1.8.20/impi/18.4/intel/18.4 - spec: hdf5@1.8.20%intel@18.4 +mpi +hl +fortran +shared - hwloc: - externals: - - prefix: /opt/psi/Libraries/hwloc/2.7.1 - spec: hwloc@2.7.1 - intel-oneapi-mpi: - externals: - - prefix: /opt/psi/Programming/intel/22.2 - spec: intel-oneapi-mpi@2021.6.0%intel@2021.6.0 jsoncpp: buildable: false externals: - prefix: /usr spec: jsoncpp@1.9.4 - julia: - externals: - - prefix: /opt/psi/Programming/Julia/1.7.3 - spec: julia@1.7.3 - krb5: - externals: - - prefix: /opt/psi/Tools/krb5/1.20 - spec: krb5@1.20 libedit: buildable: false externals: @@ -284,10 +230,6 @@ packages: externals: - prefix: /usr spec: libxt@6.0.0 - lua: - externals: - - prefix: /opt/psi/Programming/lua/5.1.4.5 - spec: lua@5.1.4.5 lz4: buildable: false externals: @@ -298,31 +240,17 @@ packages: externals: - prefix: /usr spec: m4@1.4.16 - mpich: + # E.G: only available from already downloaded source, so I put it here + mxm: + buildable: false externals: - - prefix: /opt/psi/Compiler/mpich/3.4.3_merlin/gcc/11.2.0 - spec: mpich@3.4.3%gcc@11.2.0 - nasm: - externals: - - prefix: /opt/psi/Programming/nasm/2.15.05 - spec: nasm@2.15.05 + - prefix: /opt/psi/System/mxm/3.6.3104 + spec: mxm@3.6.3104 ncurses: buildable: false externals: - prefix: /usr spec: ncurses@5.9.20130511 - netcdf-c: - externals: - - prefix: /opt/psi/HDF5/netcdf/4.8.1/hdf5/1.13.1_slurm/openmpi/4.1.3_slurm/gcc/11.2.0 - spec: netcdf-c@4.8.1%gcc@11.2.0+parallel-netcdf+mpi - - prefix: /opt/psi/HDF5_serial/netcdf/4.6.1/hdf5_serial/1.10.3/gcc/7.3.0 - spec: netcdf-c@4.6.1%gcc@7.3.0~parallel-netcdf~mpi - netcdf-fortran: - externals: - - prefix: /opt/psi/HDF5/netcdf/4.8.1/hdf5/1.13.1_slurm/openmpi/4.1.3_slurm/gcc/11.2.0 - spec: netcdf-fortran@4.8.1%gcc@11.2.0 - - prefix: /opt/psi/HDF5_serial/netcdf/4.6.1/hdf5_serial/1.10.3/gcc/7.3.0 - spec: netcdf-fortran@4.6.1%gcc@7.3.0 nlohmann-json: buildable: false externals: @@ -333,36 +261,16 @@ packages: externals: - prefix: /usr spec: numactl@2.0.14 - openjdk: - externals: - - prefix: /opt/psi/Programming/Java/15u36/bin - spec: openjdk@11.0.15_10 - openmpi: - externals: - - prefix: /opt/psi/Compiler/openmpi/4.1.3_slurm/gcc/11.2.0 - spec: openmpi@4.1.3%gcc@11.2.0 - - prefix: /opt/psi/Compiler/openmpi/4.1.3_slurm/intel/20.4 - spec: openmpi@4.1.3%intel@20.4 openssh: buildable: false externals: - prefix: /usr spec: openssh@7.4p1 - openssl: - externals: - - prefix: /opt/psi/Programming/intel/22.2/intelpython/python3.9 - spec: openssl@1.1.1n - - prefix: /usr - spec: openssl@1.0.2k-fips pcre: buildable: false externals: - prefix: /usr spec: pcre@8.32 - perl: - externals: - - prefix: /opt/psi/Programming/perl/5.30.0 - spec: perl@5.30.0+cpanm+threads pkg-config: buildable: false externals: @@ -372,10 +280,6 @@ packages: externals: - prefix: /usr spec: python@2.7.5 - r: - externals: - - prefix: /opt/psi/Programming/R/3.2.5 - spec: r@4.1.1.0 rsync: buildable: false externals: @@ -391,10 +295,6 @@ packages: externals: - prefix: /usr spec: sed@4.2.2 - slurm: - externals: - - prefix: /opt/psi/Batchsystem/slurm/21.08.6 - spec: slurm@21.08.6 subversion: buildable: false externals: @@ -405,23 +305,11 @@ packages: externals: - prefix: /usr spec: tar@1.26 - tcl: - externals: - - prefix: /opt/psi/Programming/Tcl/8.6.9 - spec: tcl@8.6.9 texinfo: buildable: false externals: - prefix: /usr spec: texinfo@5.1 - texlive: - externals: - - prefix: /opt/psi/Tools/texlive/2017 - spec: texlive@20170524 - ucx: - externals: - - prefix: /opt/psi/Libraries/ucx/1.9.0 - spec: ucx@1.9.0 xerces-c: buildable: false externals: