diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index 8e0d466..da3a939 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -96,80 +96,6 @@ ) -(define* (custom-gcc gcc name languages - #:optional - (search-paths (package-native-search-paths gcc)) - #:key (separate-lib-output? #t)) - "Return a custom version of GCC that supports LANGUAGES. Use SEARCH-PATHS as the 'native-search-paths' field." - (package (inherit gcc) - (name name) - (outputs (if separate-lib-output? - (package-outputs gcc) - (delete "lib" (package-outputs gcc)))) - (native-search-paths search-paths) - (properties (alist-delete 'hidden? (package-properties gcc))) - (arguments - (substitute-keyword-arguments (package-arguments gcc) - ((#:modules modules %gnu-build-system-modules) - `(,@modules - (srfi srfi-1) - (srfi srfi-26) - (ice-9 regex))) - ((#:configure-flags flags) - `(cons (string-append "--enable-languages=" - ,(string-join languages ",")) - (remove (cut string-match "--enable-languages.*" <>) - ,flags))) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'remove-broken-or-conflicting-files - (lambda* (#:key outputs #:allow-other-keys) - (for-each delete-file - (find-files (string-append (assoc-ref outputs "out") "/bin") - ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")) - #t)))))))) - -(define %generic-search-paths - ;; This is the language-neutral search path for GCC. Entries in $CPATH are - ;; not considered "system headers", which means GCC can raise warnings for - ;; issues in those headers. 'CPATH' is the only one that works for - ;; front-ends not in the C family. - (list (search-path-specification - (variable "CPATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64"))))) - - (define-public gfortran-11 - (hidden-package - (custom-gcc gcc-11 "gfortran" '("fortran") - %generic-search-paths))) - - - (define-public gfortran-10 - (hidden-package - (custom-gcc gcc-10 "gfortran" '("fortran") - %generic-search-paths))) - - -(define-public gfortran-toolchain-10 - (package (inherit (make-gcc-toolchain gfortran-10)) - (synopsis "Complete GCC tool chain for fortean lang development") - (description "This package provides a complete GCC tool chain for -fortran lang development to be installed in user profiles. This includes -fortran, as well as libc (headers and binaries, plus debugging symbols -in the @code{debug} output), and binutils."))) - -(define-public gfortran-toolchain-11 - (package (inherit (make-gcc-toolchain gfortran-11)) - (synopsis "Complete GCC tool chain for fortean lang development") - (description "This package provides a complete GCC tool chain for -fortran lang development to be installed in user profiles. This includes -fortran, as well as libc (headers and binaries, plus debugging symbols -in the @code{debug} output), and binutils."))) - - ;;;;;;;; @@ -330,101 +256,6 @@ in the @code{debug} output), and binutils."))) ) -(define-public glicid-rdma-core-gcc-11 -(package - (inherit rdma-core) - (name "glicid-rdma-core-gcc-11") - (version "32.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/linux-rdma/rdma-core" - "/releases/download/v" version "/rdma-core-" - version ".tar.gz")) - (sha256 - (base32 - "1z1i741bcn9vchmkjs8nxj0c0bw0jr53zj74l839n2wrb45f55w1")))) - (inputs `(("gcc-11", gcc-11) - ,@(package-inputs rdma-core))) - ) -) - -(define-public glicid-libfabric-gcc-11 -(package - (inherit libfabric) - (name "glicid-libfabric-gcc-11") - (version "1.11.2") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/ofiwg/libfabric/releases/download/v" - version "/libfabric-" version ".tar.bz2")) - (sha256 - (base32 "1nnpfkwxhim2nqjkb1vwrb4wj4j3l6w6yvvy69fqam2snlhshazz")))) - - (inputs `(("gcc-11", gcc-11) - ,@(package-inputs libfabric))) - ) -) - - -(define-public glicid-ucx-gcc-11 - (package - (inherit ucx) - (name "glicid-ucx-gcc-11") - (version "1.10.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) - )) - - (inputs `(("gcc-11", gcc-11) - ("gfortran-11", gfortran-11) - ,@(package-inputs ucx))) - ) -) - -(define-public glicid-ucx-gcc-10 - (package - (inherit ucx) - (name "glicid-ucx-gcc-10") - (version "1.9.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7")) - )) - - (inputs `(("gcc-10", gcc-10) - ("gfortran-10", gfortran-10) - ,@(package-inputs ucx))) - ) -) - - - -(define-public glicid-openmpi-gcc-11 - (package - (inherit openmpi) - (name "glicid-openpmi-gcc-11") - (version "4.1.1") -; (source -; (origin -; (method url-fetch) -; (uri (string-append "https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-" version ".tar.gz")) -; (sha256 (base32 "02hlg2pgk1np78dqlplwd5qcgrrymy8s49ng4sdrscqmvp1ng112")) -; )) - - (inputs `(("gcc-11", gcc-11) - ("gfortran-11", gfortran-11) - ("glicid-ucx-gcc-11",glicid-ucx-gcc-11) -;; ("glicid-rdma-core",glicid-rdma-core) ;;; segfault !!! - ,@(package-inputs openmpi))) - ) -) (define-public glicid-intel-mpi-benchmarks (package @@ -500,112 +331,6 @@ in the @code{debug} output), and binutils."))) )) -;;26.2 is ok : "1ilns8spik1xz2n668pf0awp4n7b3q7n886ml0q3bslb8fmqfl0i" -;;27.1 is ok : "1mqaxzsbhm7kh20dwdrapvx4x86wkbk1wgb2yyjz73l6bymv7vir" -;;28.1 is ok : "04y7wm2an842hf6idlbjvmiqnlh05xb2i9rhdb5ifzw6n3ciz5nr" -;; 30.0 crash : "1ycvd8sp3giwjbp0x3nvb8q2wrdc50s7lmzf44b9l51qgcnvvq93" -;; 31.0 crash : -;; 32.0 crash : "1z1i741bcn9vchmkjs8nxj0c0bw0jr53zj74l839n2wrb45f55w1" -;; 33.0 crash : "0cnmw04z68x042nkqxg57wijzkf9ysmvr8xxidxhxz0mxwx9impg" - -(define-public glicid-specific-rdma-core-gcc-11 - (package - (inherit rdma-core) - (name "glicid-specific-rdma-core-gcc-11") - (version "36.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/linux-rdma/rdma-core" - "/releases/download/v" version "/rdma-core-" - version ".tar.gz")) - (sha256 - (base32 -;; "1s4b80jzdi2m6j5aix3mxl6iafgbqp88pfxy7568zxwc8rkcz71x" - "13ccvy3qv5b87g3b5q86gjv4wkgv86dlm9xbmii5aiy3i10ym48l" -)))) - (inputs `(("gcc", gcc-11) - ,@(package-inputs rdma-core))) - - ) -) - -(define-public glicid-specific-libfabric-gcc-11 -(package - (inherit libfabric) - (name "glicid-specific-libfabric-gcc-11") - (version "1.12.1") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/ofiwg/libfabric/releases/download/v" - version "/libfabric-" version ".tar.bz2")) - (sha256 - (base32 "0b34p88w399jabdf77jpskxyv2j60nwxlsj3lyk9svjy9458wg6v")))) - - (inputs `(("gcc", gcc-11) - ("rdma-core", glicid-specific-rdma-core-gcc-11) - ,@(package-inputs libfabric))) - ) -) - -(define-public glicid-specific-ucx-gcc-11 - (package - (inherit ucx) - (name "glicid-specific-ucx-gcc-11") - (version "1.10.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "0bdrbp86snq5z0y66zzxs7ig33g9h59kag11rc1lqwll3d5y51dq")) - )) - - (inputs `(("gcc", gcc-11) - ("gfortran", gfortran-11) - ("libfabric", glicid-specific-libfabric-gcc-11) - ("rdma-core",glicid-specific-rdma-core-gcc-11) - - ,@(package-inputs ucx))) - ) -) - -(define-public glicid-specific-ucx-gcc-10 - (package - (inherit ucx) - (name "glicid-specific-ucx-gcc-10") - (version "1.9.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "1yrmwvjxi3najax1wz4irpzxns6cp74ksdx4i1049mf03n2ci8m7")) - )) - - (inputs `(("gcc", gcc-10) - ("gfortran", gfortran-10) - ("libfabric", glicid-specific-libfabric-gcc-11) - ("rdma-core",glicid-specific-rdma-core-gcc-11) - - ,@(package-inputs ucx))) - ) -) - - -(define-public glicid-specific-openmpi - (package - (inherit glicid-openmpi-gcc-11) - (name "glicid-specific-openmpi") - (inputs `( - ("gcc",gcc-11) - ("rdma-core",glicid-specific-rdma-core-gcc-11) - ("ucx",glicid-specific-ucx-gcc-10) - ("libfabric",glicid-specific-libfabric-gcc-11) -; ("slurm", glicid-specific-slurm) - ,@(package-inputs glicid-openmpi-gcc-11))) - ) -) - (define-public glicid-specific-intel-mpi-benchmarks (package (inherit glicid-intel-mpi-benchmarks) diff --git a/glicid/packages/patches/ceph-fix-snappy-breaking-change.patch b/glicid/packages/patches/ceph-fix-snappy-breaking-change.patch new file mode 100644 index 0000000..7a10e2e --- /dev/null +++ b/glicid/packages/patches/ceph-fix-snappy-breaking-change.patch @@ -0,0 +1,13 @@ +Patch tracked upstream at https://tracker.ceph.com/issues/50934 + +--- a/src/compressor/snappy/SnappyCompressor.h ++++ b/src/compressor/snappy/SnappyCompressor.h +@@ -96,7 +96,7 @@ class SnappyCompressor : public Compressor { + if (qat_enabled) + return qat_accel.decompress(p, compressed_len, dst); + #endif +- snappy::uint32 res_len = 0; ++ uint32_t res_len = 0; + BufferlistSource source_1(p, compressed_len); + if (!snappy::GetUncompressedLength(&source_1, &res_len)) { + return -1;