From 55915d466305bd00d15f605541ec926ca6fe0833 Mon Sep 17 00:00:00 2001 From: pjotrp Date: Tue, 23 Feb 2016 17:40:31 +0000 Subject: Arrayfire fixes --- gn/packages/arrayfire.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm index 1d3401d..5869a88 100644 --- a/gn/packages/arrayfire.scm +++ b/gn/packages/arrayfire.scm @@ -16,12 +16,13 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -(define-module (gnu packages arrayfire) +(define-module (gn packages arrayfire) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) - #:use-module (guix cmake-build-system) + #:use-module (guix build-system cmake) #:use-module (guix licenses) + #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages curl) #:use-module (gnu packages gawk) @@ -32,9 +33,9 @@ #:use-module (gnu packages video) #:use-module (gnu packages tls) #:use-module (gnu packages textutils) - #:use-module (gnu packages fftw) - #:use-module (gnu packages fftw-openmpi) - #:use-module (gnu packages fftwf) + ;; #:use-module (gnu packages fftw) + ;; #:use-module (gnu packages fftw-openmpi) - in algebra + ;; #:use-module (gnu packages fftwf) #:use-module (gnu packages gl) #:use-module (gnu packages glew) #:use-module (gnu packages pkg-config) -- cgit v1.2.3 From c27a4c0a6586fcb3532a39b1d7875856e4d1e574 Mon Sep 17 00:00:00 2001 From: Dennis E. Mungai Date: Tue, 8 Mar 2016 23:14:40 +0300 Subject: pocl updated with all dependencies. Have fun.--- gn/packages/pocl.scm | 122 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 116 insertions(+), 6 deletions(-) diff --git a/gn/packages/pocl.scm b/gn/packages/pocl.scm index c5cb8cb..93534b7 100644 --- a/gn/packages/pocl.scm +++ b/gn/packages/pocl.scm @@ -20,6 +20,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix git-download) #:use-module (guix download) + #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix packages) #:use-module (gnu packages algebra) @@ -38,9 +39,13 @@ #:use-module (gnu packages maths) #:use-module (gnu packages mpi) #:use-module (gnu packages web) + #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages xorg) - #:use-module (gnu packages version-control) + #:use-module (gnu packages version-control) + #:use-module (gnu packages ruby) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages zip) #:use-module (gnu packages linux)) (define-public pocl @@ -76,19 +81,28 @@ ("libjpeg" ,libjpeg) ("libltdl" ,libltdl) ("libtiff" ,libtiff) - ("llvm" ,llvm) + ("llvm" ,llvm-3.7.1) + ("ocl-icd" ,ocl-icd) + ("opencl-headers" ,opencl-headers) ("mesa-utils" ,mesa-utils) ("openmpi" ,openmpi) + ("perl" ,perl) ("randrproto" ,randrproto) ("libxrandr" ,libxrandr) ("xineramaproto" ,xineramaproto) ("libxinerama" ,libxinerama) ("libxcursor" ,libxcursor) ("fftw-openmpi" ,fftw-openmpi))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release" "-DBUILD_SHARED_LIBS=ON") - #:tests? #f)) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--enable-icd") + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before + 'configure 'rewrite-usr-bin + (lambda _ + (zero? (system* "./autogen.sh"))))))) (synopsis "pocl: Portable Computing Language (pocl) aims to become a MIT-licensed open source implementation of the OpenCL standard which can be easily adapted for new targets and devices, both for homogeneous CPU and heterogenous GPUs/accelerators.") @@ -97,3 +111,99 @@ new targets and devices, both for homogeneous CPU and heterogenous GPUs/accelerators.") (home-page "http://portablecl.org/") (license license:gpl2)))) + +(define-public llvm-3.7.1 +(package + (name "llvm-3.7.1") + (version "3.7.1") + (source + (origin + (method url-fetch) + (uri (string-append "http://llvm.org/releases/" + version "/llvm-" version ".src.tar.xz")) + (sha256 + (base32 + "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy")))) + (build-system cmake-build-system) + (native-inputs + `(("python" ,python-wrapper) + ("perl" ,perl))) + (arguments + `(#:configure-flags '("-DCMAKE_SKIP_BUILD_RPATH=FALSE" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"))) + (home-page "http://www.llvm.org") + (synopsis "Optimizing compiler infrastructure") + (description + "LLVM is a compiler infrastructure designed for compile-time, link-time, +runtime, and idle-time optimization of programs from arbitrary programming +languages. It currently supports compilation of C and C++ programs, using +front-ends derived from GCC 4.0.1. A new front-end for the C family of +languages is in development. The compiler infrastructure includes mirror sets +of programming tools as well as libraries with equivalent functionality.") + (license license:ncsa))) + +(define-public ocl-icd + (package + (name "ocl-icd") + (version "2.2.9") + (source (origin + (method url-fetch) + (uri (string-append "https://forge.imag.fr/frs/download.php/716/ocl-icd-" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc")))) + (inputs `(("zip" ,zip) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("ruby" ,ruby) + ("libtool" ,libtool) + ("opencl-headers" ,opencl-headers) + ("libgcrypt" ,libgcrypt))) + (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack `bootstrap + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) + (home-page "https://forge.imag.fr/projects/ocl-icd/") + (synopsis "OpenCL implementations are provided as ICD (Installable Client Driver).") + (description "OpenCL implementations are provided as ICD (Installable Client Driver). + An OpenCL program can use several ICD thanks to the use of an ICD Loader as provided by this project. + This free ICD Loader can load any (free or non free) ICD") + (license license:gpl2))) + + (define-public opencl-headers +(let ((commit "c1770dc")) + (package + (name "opencl-headers") + (version (string-append "2.1-" commit )) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/OpenCL-Headers.git") + (commit commit))) + (file-name (string-append name "-" commit)) + (sha256 + (base32 + "0m9fkblqja0686i2jjqiszvq3df95gp01a2674xknlmkd6525rck")))) + (propagated-inputs '()) + (inputs '()) + (native-inputs '()) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "." (string-append + (assoc-ref outputs "out") + "/include/CL"))))))) + (synopsis "The Khronos OpenCL headers") + (description "This package provides the Khronos OpenCL headers") + (home-page "https://www.khronos.org/registry/cl/") + (license license:gpl2)))) -- cgit v1.2.3 From 8fa5616879f7b973a8377e6ac3ca46726b459f22 Mon Sep 17 00:00:00 2001 From: Dennis E. Mungai Date: Sat, 12 Mar 2016 02:28:47 +0300 Subject: WIP Work in progress. Investigate,--- gn/packages/pocl.scm | 189 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 154 insertions(+), 35 deletions(-) diff --git a/gn/packages/pocl.scm b/gn/packages/pocl.scm index 93534b7..39f16c0 100644 --- a/gn/packages/pocl.scm +++ b/gn/packages/pocl.scm @@ -20,15 +20,21 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix git-download) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix packages) + #:use-module (gnu packages) + #:use-module (srfi srfi-1) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages curl) #:use-module (gnu packages boost) + #:use-module (gnu packages bootstrap) + #:use-module (gnu packages base) #:use-module (gnu packages gawk) #:use-module (gnu packages cmake) + #:use-module (gnu packages gcc) #:use-module (gnu packages glib) #:use-module (gnu packages image) #:use-module (gnu packages video) @@ -42,6 +48,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages xorg) + #:use-module (gnu packages xml) #:use-module (gnu packages version-control) #:use-module (gnu packages ruby) #:use-module (gnu packages gnupg) @@ -49,7 +56,7 @@ #:use-module (gnu packages linux)) (define-public pocl -(let ((commit "a6f377a")) +(let ((commit "7aefc52")) (package (name "pocl") (version (string-append "v09rc-" commit )) @@ -61,7 +68,7 @@ (file-name (string-append name "-" commit)) (sha256 (base32 - "0b1y8c2y0xx5sqfpkkvgmp02czgmq5immypgm4hhpmp512hcj38j")))) + "03wbcxkx1w5kx0crangsnah0xq218bhb99vglmn00wcjhhw80qim")))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) @@ -70,8 +77,8 @@ (inputs `(("python" ,python-2) ("boost" ,boost) ("dbus" ,dbus) - ("clang" ,clang) - ("clang-runtime" ,clang-runtime) + ("clang" ,clang-3.7.1) + ("clang-runtime" ,clang-runtime-3.7.1) ("enca" ,enca) ("eudev" ,eudev) ("fftw-openmpi" ,fftw-openmpi) @@ -111,37 +118,7 @@ new targets and devices, both for homogeneous CPU and heterogenous GPUs/accelerators.") (home-page "http://portablecl.org/") (license license:gpl2)))) - -(define-public llvm-3.7.1 -(package - (name "llvm-3.7.1") - (version "3.7.1") - (source - (origin - (method url-fetch) - (uri (string-append "http://llvm.org/releases/" - version "/llvm-" version ".src.tar.xz")) - (sha256 - (base32 - "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy")))) - (build-system cmake-build-system) - (native-inputs - `(("python" ,python-wrapper) - ("perl" ,perl))) - (arguments - `(#:configure-flags '("-DCMAKE_SKIP_BUILD_RPATH=FALSE" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"))) - (home-page "http://www.llvm.org") - (synopsis "Optimizing compiler infrastructure") - (description - "LLVM is a compiler infrastructure designed for compile-time, link-time, -runtime, and idle-time optimization of programs from arbitrary programming -languages. It currently supports compilation of C and C++ programs, using -front-ends derived from GCC 4.0.1. A new front-end for the C family of -languages is in development. The compiler infrastructure includes mirror sets -of programming tools as well as libraries with equivalent functionality.") - (license license:ncsa))) - + (define-public ocl-icd (package (name "ocl-icd") @@ -207,3 +184,145 @@ of programming tools as well as libraries with equivalent functionality.") (description "This package provides the Khronos OpenCL headers") (home-page "https://www.khronos.org/registry/cl/") (license license:gpl2)))) + +(define (clang-runtime-from-llvm llvm hash) + (package + (name "clang-runtime") + (version (package-version llvm-3.7.1)) + (source + (origin + (method url-fetch) + (uri (string-append "http://llvm.org/releases/" + version "/compiler-rt-" version ".src.tar.xz")) + (sha256 + (base32 + "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx")))) + (build-system cmake-build-system) + (native-inputs (package-native-inputs llvm)) + (inputs + `(("llvm" ,llvm))) + (arguments + `(;; Don't use '-g' during the build to save space. + #:build-type "Release")) + + (home-page "http://compiler-rt.llvm.org") + (synopsis "Runtime library for Clang/LLVM") + (description + "The \"clang-runtime\" library provides the implementations of run-time +functions for C and C++ programs. It also provides header files that allow C +and C++ source code to interface with the \"sanitization\" passes of the clang +compiler. In LLVM this library is called \"compiler-rt\".") + (license license:ncsa) + + ;; doesn't list MIPS as supported. + (supported-systems (delete "mips64el-linux" %supported-systems)))) + +(define (clang-from-llvm llvm clang-runtime hash) + (package + (name "clang") + (version (package-version llvm-3.7.1)) + (source + (origin + (method url-fetch) + (uri (string-append "http://llvm.org/releases/" + version "/cfe-" version ".src.tar.xz")) + (sha256 + (base32 + "0x065d0w9b51xvdjxwfzjxng0gzpbx45fgiaxpap45ragi61dqjn")) + (patches (list (search-patch "clang-libc-search-path.patch"))))) + ;; Using cmake allows us to treat llvm as an external library. There + ;; doesn't seem to be any way to do this with clang's autotools-based + ;; build system. + (build-system cmake-build-system) + (native-inputs (package-native-inputs llvm)) + (inputs + `(("libxml2" ,libxml2) + ("libstdc++-4.9", libstdc++-4.9) + ("python" ,python-2) + ("gcc-lib" ,gcc "lib") + ,@(package-inputs llvm))) + (propagated-inputs + `(("llvm" ,llvm) + ("clang-runtime" ,clang-runtime))) + (arguments + `(#:configure-flags + (list "-DCLANG_INCLUDE_TESTS=True" + + ;; Find libgcc_s, crtbegin.o, and crtend.o. + (string-append "-DGCC_INSTALL_PREFIX=" + (assoc-ref %build-inputs "gcc-lib")) + + ;; Use a sane default include directory. + (string-append "-DC_INCLUDE_DIRS=" + (assoc-ref %build-inputs "libc") + "/include")) + + ;; Don't use '-g' during the build to save space. + #:build-type "Release" + + #:phases (modify-phases %standard-phases + (add-after + 'unpack 'set-glibc-file-names + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "libc")) + (compiler-rt (assoc-ref inputs "clang-runtime"))) + (substitute* "lib/Driver/Tools.cpp" + ;; Patch the 'getLinuxDynamicLinker' function to that + ;; it uses the right dynamic linker file name. + (("/lib64/ld-linux-x86-64.so.2") + (string-append libc + ,(glibc-dynamic-linker))) + + ;; Link to libclang_rt files from clang-runtime. + (("TC\\.getDriver\\(\\)\\.ResourceDir") + (string-append "\"" compiler-rt "\""))) + + ;; Same for libc's libdir, to allow crt1.o & co. to be + ;; found. + (substitute* "lib/Driver/ToolChains.cpp" + (("@GLIBC_LIBDIR@") + (string-append libc "/lib"))))))))) + + ;; Clang supports the same environment variables as GCC. + (native-search-paths + (list (search-path-specification + (variable "CPATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64"))))) + + (home-page "http://clang.llvm.org") + (synopsis "C language family frontend for LLVM") + (description + "Clang is a compiler front end for the C, C++, Objective-C and +Objective-C++ programming languages. It uses LLVM as its back end. The Clang +project includes the Clang front end, the Clang static analyzer, and several +code analysis tools.") + (license license:ncsa))) + +(define-public llvm-3.7.1 + (package (inherit llvm) + (version "3.7.1") + (source + (origin + (method url-fetch) + (uri (string-append "http://llvm.org/releases/" + version "/llvm-" version ".src.tar.xz")) + (sha256 + (base32 + "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy")))))) + +(define-public clang-runtime-3.7.1 + (clang-runtime-from-llvm + llvm-3.7.1 + "0dl1kbrhz96djsxqr61iw5h788s7ncfpfb7aayixky1bhdaydcx4")) + +(define-public clang-3.7.1 + (clang-from-llvm llvm clang-runtime + "12yv3jwdjcbkrx7zjm8wh4jrvb59v8fdw4mnmz3zc1jb00p9k07w")) + + + + + -- cgit v1.2.3 From e907a90f787ae34b5f033058ddef20808b338025 Mon Sep 17 00:00:00 2001 From: Dennis E. Mungai Date: Sat, 12 Mar 2016 07:38:35 +0300 Subject: Add Intel Beignet to guix This is Intel's Beignet, Intel's OpenCL platform for their GPUs and CPUs.--- gn/packages/beignet.scm | 148 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 gn/packages/beignet.scm diff --git a/gn/packages/beignet.scm b/gn/packages/beignet.scm new file mode 100644 index 0000000..7aed6d8 --- /dev/null +++ b/gn/packages/beignet.scm @@ -0,0 +1,148 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Dennis Mungai +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gn packages beignet) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) + #:use-module (guix packages) + #:use-module (gnu packages) + #:use-module (guix utils) + #:use-module (gnu packages algebra) + #:use-module (gnu packages autotools) + #:use-module (gnu packages bootstrap) + #:use-module (gnu packages gawk) + #:use-module (gnu packages cmake) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages llvm) + #:use-module (gnu packages video) + #:use-module (gnu packages textutils) + #:use-module (gnu packages gl) + #:use-module (gnu packages ruby) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages maths) + #:use-module (gnu packages web) + #:use-module (gnu packages python) + #:use-module (gnu packages xorg) + #:use-module (gnu packages version-control) + #:use-module (gnu packages zip) + #:use-module (gnu packages linux)) + +(define-public beignet +(let ((commit "4e7d5a0c7a269b2c0b70e37e4e7fcb254065c042")) + (package + (name "beignet") + (version (string-append "master" commit )) + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://anongit.freedesktop.org/beignet") + (commit commit))) + (file-name (string-append name "-" commit)) + (sha256 + (base32 + "1gs6ls2jgwkrk5555nw9vsmqfqx3q49nnpq2d5xqm87qym78p5r2")))) + (inputs `(("autoconf" ,autoconf) + ("llvm" ,llvm) + ("libpthread-stubs", libpthread-stubs) + ("clang" ,clang) + ("clang-runtime" ,clang-runtime) + ("libtool" ,libtool) + ("libsm" ,libsm) + ("python" ,python-2) + ("opencl-headers" ,opencl-headers) + ("glu" ,glu) + ("pkg-config" ,pkg-config) + ("freeglut" ,freeglut) + ("mesa-utils" ,mesa-utils) + ("ocl-icd" ,ocl-icd))) + (build-system cmake-build-system) + (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release") #:tests? #f)) + (home-page "https://forge.imag.fr/projects/ocl-icd/") + (synopsis "Intel's OpenCL framework") + (description "Intel's OpenCL framework that works with Intel IvyBridge GPUs and above") + (license license:gpl2)))) + +(define-public ocl-icd + (package + (name "ocl-icd") + (version "2.2.9") + (source (origin + (method url-fetch) + (uri (string-append "https://forge.imag.fr/frs/download.php/716/ocl-icd-" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc")))) + (inputs `(("zip" ,zip) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("ruby" ,ruby) + ("libtool" ,libtool) + ("opencl-headers" ,opencl-headers) + ("libgcrypt" ,libgcrypt))) + (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack `bootstrap + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) + (home-page "https://forge.imag.fr/projects/ocl-icd/") + (synopsis "OpenCL implementations are provided as ICD (Installable Client Driver).") + (description "OpenCL implementations are provided as ICD (Installable Client Driver). + An OpenCL program can use several ICD thanks to the use of an ICD Loader as provided by this project. + This free ICD Loader can load any (free or non free) ICD") + (license license:gpl2))) + +(define-public opencl-headers +(let ((commit "c1770dc")) + (package + (name "opencl-headers") + (version (string-append "2.1-" commit )) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/OpenCL-Headers.git") + (commit commit))) + (file-name (string-append name "-" commit)) + (sha256 + (base32 + "0m9fkblqja0686i2jjqiszvq3df95gp01a2674xknlmkd6525rck")))) + (propagated-inputs '()) + (inputs '()) + (native-inputs '()) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "." (string-append + (assoc-ref outputs "out") + "/include/CL"))))))) + (synopsis "The Khronos OpenCL headers") + (description "This package provides the Khronos OpenCL headers") + (home-page "https://www.khronos.org/registry/cl/") + (license license:gpl2)))) -- cgit v1.2.3 From 88b8a6c91c482b419e6a36301d7b84745c19157f Mon Sep 17 00:00:00 2001 From: Dennis E. Mungai Date: Sat, 12 Mar 2016 21:34:26 +0300 Subject: Add a few more deps (needed glut) Intel's Beignet package still can't build on guix, complains about libclang.--- gn/packages/beignet.scm | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/gn/packages/beignet.scm b/gn/packages/beignet.scm index 7aed6d8..a9e7a75 100644 --- a/gn/packages/beignet.scm +++ b/gn/packages/beignet.scm @@ -30,9 +30,11 @@ #:use-module (gnu packages bootstrap) #:use-module (gnu packages gawk) #:use-module (gnu packages cmake) + #:use-module (gnu packages compression) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages llvm) + #:use-module (gnu packages libedit) #:use-module (gnu packages video) #:use-module (gnu packages textutils) #:use-module (gnu packages gl) @@ -40,46 +42,52 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages maths) #:use-module (gnu packages web) + #:use-module (gnu packages ncurses) #:use-module (gnu packages python) #:use-module (gnu packages xorg) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages version-control) #:use-module (gnu packages zip) #:use-module (gnu packages linux)) (define-public beignet -(let ((commit "4e7d5a0c7a269b2c0b70e37e4e7fcb254065c042")) (package - (name "beignet") - (version (string-append "master" commit )) - (source (origin - (method git-fetch) - (uri (git-reference - (url "git://anongit.freedesktop.org/beignet") - (commit commit))) - (file-name (string-append name "-" commit)) - (sha256 - (base32 - "1gs6ls2jgwkrk5555nw9vsmqfqx3q49nnpq2d5xqm87qym78p5r2")))) + (name "beignet") + (version "1.1.1") + (source (origin + (method url-fetch) + (uri (string-append "https://01.org/sites/default/files/beignet-" + version "-source.tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "068i5srqpncfw0kklxdyzxcm5w56pi91jp7pkv6cglzvnjgcdx4v")))) (inputs `(("autoconf" ,autoconf) - ("llvm" ,llvm) + ("llvm" ,llvm-3.5) ("libpthread-stubs", libpthread-stubs) - ("clang" ,clang) - ("clang-runtime" ,clang-runtime) + ("clang" ,clang-3.5) + ("libdrm" ,libdrm) ("libtool" ,libtool) ("libsm" ,libsm) + ("libxfixes" ,libxfixes) + ("libxext" ,libxext) + ("libedit" ,libedit) + ("xextproto" ,xextproto) ("python" ,python-2) ("opencl-headers" ,opencl-headers) ("glu" ,glu) + ("zlib" ,zlib) ("pkg-config" ,pkg-config) ("freeglut" ,freeglut) ("mesa-utils" ,mesa-utils) + ("ncurses" ,ncurses) ("ocl-icd" ,ocl-icd))) (build-system cmake-build-system) - (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release") #:tests? #f)) + (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release" "-DCOMPILER=CLANG") #:tests? #f)) (home-page "https://forge.imag.fr/projects/ocl-icd/") (synopsis "Intel's OpenCL framework") (description "Intel's OpenCL framework that works with Intel IvyBridge GPUs and above") - (license license:gpl2)))) + (license license:gpl2))) (define-public ocl-icd (package @@ -146,3 +154,5 @@ (description "This package provides the Khronos OpenCL headers") (home-page "https://www.khronos.org/registry/cl/") (license license:gpl2)))) + + -- cgit v1.2.3 From f35792af6aed186484bce9a361b8d2bc1116161b Mon Sep 17 00:00:00 2001 From: Dennis E. Mungai Date: Fri, 18 Mar 2016 05:21:29 +0300 Subject: Bump version to v3.3.3 Also change licensing schema with #prefix (es). Solves namespace problems. Also added wget as an input (As it's needed as a fallback incase checksums for Boost are invalid).--- gn/packages/arrayfire.scm | 99 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 89 insertions(+), 10 deletions(-) diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm index 7756a97..b94a0ac 100644 --- a/gn/packages/arrayfire.scm +++ b/gn/packages/arrayfire.scm @@ -17,14 +17,17 @@ ;;; along with GNU Guix. If not, see . (define-module (gn packages arrayfire) - #:use-module ((guix licenses)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix packages) + #:use-module (gnu packages) + #:use-module (guix utils) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) + #:use-module (gnu packages bootstrap) #:use-module (gnu packages curl) #:use-module (gnu packages gawk) #:use-module (gnu packages cmake) @@ -34,20 +37,23 @@ #:use-module (gnu packages video) #:use-module (gnu packages textutils) #:use-module (gnu packages gl) + #:use-module (gnu packages gnupg) #:use-module (gnu packages pkg-config) #:use-module (gnu packages maths) #:use-module (gnu packages web) - #:use-module (gnu packages ldc) + #:use-module (gnu packages wget) #:use-module (gnu packages python) + #:use-module (gnu packages ruby) #:use-module (gnu packages xorg) - #:use-module (gnu packages version-control) + #:use-module (gnu packages version-control) + #:use-module (gnu packages zip) #:use-module (gnu packages linux)) (define-public arrayfire -(let ((commit "9ca1ea0")) +(let ((commit "e118bf2")) (package (name "arrayfire") - (version "3.3.1-hotfix") + (version "3.3.3") (source (origin (method git-fetch) (uri (git-reference @@ -56,12 +62,15 @@ (file-name (string-append name "-" commit)) (sha256 (base32 - "067y98a9s78vpz7xsg889xnwfaza7c5gdv97yg9cgrdl0iljvsgp")))) + "050lwbl31spia17n9yq70z86x5inrahsd0y781g46a8ry2psviyj")))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("cmake" ,cmake) ("gawk" ,gawk) + ("git" ,git) + ("wget" ,wget) ("glew" ,glew) + ("git" ,git) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (inputs `(("boost" ,boost) @@ -69,11 +78,14 @@ ("curl" ,curl) ("atlas" ,atlas) ("dbus" ,dbus) + ("opencl-headers" ,opencl-headers) + ("ocl-icd" ,ocl-icd) ("enca" ,enca) ("eudev" ,eudev) ("glew" ,glew) ("glib" ,glib) ("lapack" ,lapack) + ("scalapack" ,scalapack) ("libcap" ,libcap) ("libjpeg" ,libjpeg) ("libltdl" ,libltdl) @@ -82,21 +94,21 @@ ("mesa-utils" ,mesa-utils) ("python" ,python-2) ("freeimage" ,freeimage) + ("freeglut" ,freeglut) ("fftw" ,fftw) ("fftwf" ,fftwf) ("fftw-openmpi" ,fftw-openmpi) ("glew" ,glew) ("glu" ,glu) ("openblas" ,openblas) - ("git" ,git) ("cmake" ,cmake))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release" "-DBUILD_OPENCL=OFF" "-DBUILD_GRAPHICS=OFF") #:tests? #f)) + `(#:configure-flags '("-DBUILD_OPENCL=ON" "-DBUILD_GRAPHICS=OFF") #:tests? #f)) (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com") (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.") (home-page "http://arrayfire.com/") - (license (list gpl2 gpl2+ gpl3 gpl3+))))) + (license (list license:gpl2 license:gpl2+ license:gpl3 license:gpl3+))))) (define-public glfw (package @@ -114,6 +126,7 @@ (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("cmake" ,cmake) + ("git" ,git) ("libtool" ,libtool) ("libpthread-stubs" ,libpthread-stubs) ("pkg-config" ,pkg-config))) @@ -136,5 +149,71 @@ (home-page "http://www.glfw.org/") (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.") (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.") - (license (list gpl2)))) + (license (list license:gpl2)))) + +(define-public ocl-icd + (package + (name "ocl-icd") + (version "2.2.9") + (source (origin + (method url-fetch) + (uri (string-append "https://forge.imag.fr/frs/download.php/716/ocl-icd-" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc")))) + (inputs `(("zip" ,zip) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("ruby" ,ruby) + ("libtool" ,libtool) + ("opencl-headers" ,opencl-headers) + ("libgcrypt" ,libgcrypt))) + (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack `bootstrap + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) + (home-page "https://forge.imag.fr/projects/ocl-icd/") + (synopsis "OpenCL implementations are provided as ICD (Installable Client Driver).") + (description "OpenCL implementations are provided as ICD (Installable Client Driver). + An OpenCL program can use several ICD thanks to the use of an ICD Loader as provided by this project. + This free ICD Loader can load any (free or non free) ICD") + (license (list license:gpl2 license:ruby)))) + +(define-public opencl-headers +(let ((commit "c1770dc")) + (package + (name "opencl-headers") + (version (string-append "2.1-" commit )) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/OpenCL-Headers.git") + (commit commit))) + (file-name (string-append name "-" commit)) + (sha256 + (base32 + "0m9fkblqja0686i2jjqiszvq3df95gp01a2674xknlmkd6525rck")))) + (propagated-inputs '()) + (inputs '()) + (native-inputs '()) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "." (string-append + (assoc-ref outputs "out") + "/include/CL"))))))) + (synopsis "The Khronos OpenCL headers") + (description "This package provides the Khronos OpenCL headers") + (home-page "https://www.khronos.org/registry/cl/") + (license (list license:gpl2))))) -- cgit v1.2.3 From dc7f586ecf6b148bbd8ffcbb28ad7c4a9c492874 Mon Sep 17 00:00:00 2001 From: Dennis E. Mungai Date: Fri, 18 Mar 2016 20:58:16 +0300 Subject: Use proper formatting for License lists Also updates the Arrayfire fetch URL to the one hosted by Arrayfire as Github's generated tarballs do not package the required submodules.--- gn/packages/arrayfire.scm | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm index b94a0ac..084a841 100644 --- a/gn/packages/arrayfire.scm +++ b/gn/packages/arrayfire.scm @@ -50,27 +50,22 @@ #:use-module (gnu packages linux)) (define-public arrayfire -(let ((commit "e118bf2")) - (package +(package (name "arrayfire") - (version "3.3.3") + (version "3.3.1") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/arrayfire/arrayfire.git") - (commit commit))) - (file-name (string-append name "-" commit)) + (method url-fetch) + (uri (string-append "http://arrayfire.com/arrayfire_source/arrayfire-full-" version + ".tar.bz2")) + (file-name (string-append name "-" version ".tar.bz2")) (sha256 (base32 - "050lwbl31spia17n9yq70z86x5inrahsd0y781g46a8ry2psviyj")))) + "045adww6dqmyz6kkfmq7xawi5v9a894yp5j9pzn6j568gi48pyqc")))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("cmake" ,cmake) ("gawk" ,gawk) ("git" ,git) - ("wget" ,wget) ("glew" ,glew) - ("git" ,git) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (inputs `(("boost" ,boost) @@ -101,14 +96,19 @@ ("glew" ,glew) ("glu" ,glu) ("openblas" ,openblas) + ("wget" ,wget) ("cmake" ,cmake))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DBUILD_OPENCL=ON" "-DBUILD_GRAPHICS=OFF") #:tests? #f)) + `(#:configure-flags '("-DBUILD_OPENCL=ON" "-DBUILD_CUDA=OFF" "-DBUILD_GRAPHICS=OFF") + #:tests? #f)) (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com") (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.") (home-page "http://arrayfire.com/") - (license (list license:gpl2 license:gpl2+ license:gpl3 license:gpl3+))))) + (license (list license:gpl2 + license:gpl2+ + license:gpl3 + license:gpl3+)))) (define-public glfw (package @@ -122,7 +122,8 @@ (base32 "08pixv8hd5xsccf7l8cqcijjqaq4k4da8qbp77wggal2fq445ika")))) (build-system cmake-build-system) - (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON") #:tests? #f)) + (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON") + #:tests? #f)) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("cmake" ,cmake) -- cgit v1.2.3 From 74cc102b7bf3d1793f265e465ac3083af4b67bf1 Mon Sep 17 00:00:00 2001 From: Dennis E. Mungai Date: Fri, 18 Mar 2016 22:07:51 +0300 Subject: Package now builds on GNU Guix Caveats: Only the CPU back-end builds at the moment. Needed inputs for OpenCL backends: clFFT and clBLAS.--- gn/packages/arrayfire.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm index 084a841..a581389 100644 --- a/gn/packages/arrayfire.scm +++ b/gn/packages/arrayfire.scm @@ -100,7 +100,7 @@ ("cmake" ,cmake))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DBUILD_OPENCL=ON" "-DBUILD_CUDA=OFF" "-DBUILD_GRAPHICS=OFF") + `(#:configure-flags '("-DBUILD_OPENCL=OFF" "-DBUILD_CUDA=OFF" "-DBUILD_GRAPHICS=OFF") #:tests? #f)) (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com") (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.") -- cgit v1.2.3 From 7ebae21b5b6d520c39cec12009f5e27e7839ad25 Mon Sep 17 00:00:00 2001 From: Dennis E. Mungai Date: Fri, 18 Mar 2016 22:28:14 +0300 Subject: Ported clFFT to GNU Guix Package builds successfully.--- gn/packages/clFFT.scm | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 gn/packages/clFFT.scm diff --git a/gn/packages/clFFT.scm b/gn/packages/clFFT.scm new file mode 100644 index 0000000..3e72357 --- /dev/null +++ b/gn/packages/clFFT.scm @@ -0,0 +1,158 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Dennis Mungai +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gn packages clFFT) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) + #:use-module (guix packages) + #:use-module (gnu packages algebra) + #:use-module (gnu packages bootstrap) + #:use-module (gnu packages base) + #:use-module (gnu packages autotools) + #:use-module (gnu packages curl) + #:use-module (gnu packages gawk) + #:use-module (gnu packages cmake) + #:use-module (gnu packages boost) + #:use-module (gnu packages glib) + #:use-module (gnu packages image) + #:use-module (gnu packages video) + #:use-module (gnu packages textutils) + #:use-module (gnu packages gl) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages maths) + #:use-module (gnu packages mpi) + #:use-module (gnu packages ruby) + #:use-module (gnu packages web) + #:use-module (gnu packages python) + #:use-module (gnu packages xorg) + #:use-module (gnu packages version-control) + #:use-module (gnu packages zip) + #:use-module (gnu packages linux)) + +(define-public clFFT + (package + (name "clFFT") + (version "v2.10.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/clMathLibraries/clFFT/archive/" + version ".tar.gz")) + (sha256 + (base32 + "19hrk1lf06kch8x9dpbdj0waycn2mldrmj2y4vzi7zn2gdfw6g73")))) + (build-system cmake-build-system) + (arguments `(#:configure-flags '("../clFFT-2.10.1/src" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=Release") #:tests? #f)) + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("cmake" ,cmake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs `(("curl" ,curl) + ("dbus" ,dbus) + ("enca" ,enca) + ("eudev" ,eudev) + ("fftw-openmpi" ,fftw-openmpi) + ("glew" ,glew) + ("libcap" ,libcap) + ("libjpeg" ,libjpeg) + ("libltdl" ,libltdl) + ("libtiff" ,libtiff) + ("mesa-utils" ,mesa-utils) + ("openmpi" ,openmpi) + ("ocl-icd" ,ocl-icd) + ("opencl-headers" ,opencl-headers) + ("randrproto" ,randrproto) + ("libxrandr" ,libxrandr) + ("xineramaproto" ,xineramaproto) + ("libxinerama" ,libxinerama) + ("libxcursor" ,libxcursor) + ("python" ,python-2))) + (home-page "http://www.glfw.org/") + (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.") + (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.") + (license (list license:gpl2)))) + +(define-public ocl-icd + (package + (name "ocl-icd") + (version "2.2.9") + (source (origin + (method url-fetch) + (uri (string-append "https://forge.imag.fr/frs/download.php/716/ocl-icd-" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc")))) + (inputs `(("zip" ,zip) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("ruby" ,ruby) + ("libtool" ,libtool) + ("opencl-headers" ,opencl-headers) + ("libgcrypt" ,libgcrypt))) + (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack `bootstrap + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) + (home-page "https://forge.imag.fr/projects/ocl-icd/") + (synopsis "OpenCL implementations are provided as ICD (Installable Client Driver).") + (description "OpenCL implementations are provided as ICD (Installable Client Driver). + An OpenCL program can use several ICD thanks to the use of an ICD Loader as provided by this project. + This free ICD Loader can load any (free or non free) ICD") + (license (list license:gpl2 license:ruby)))) + +(define-public opencl-headers +(let ((commit "c1770dc")) + (package + (name "opencl-headers") + (version (string-append "2.1-" commit )) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/OpenCL-Headers.git") + (commit commit))) + (file-name (string-append name "-" commit)) + (sha256 + (base32 + "0m9fkblqja0686i2jjqiszvq3df95gp01a2674xknlmkd6525rck")))) + (propagated-inputs '()) + (inputs '()) + (native-inputs '()) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "." (string-append + (assoc-ref outputs "out") + "/include/CL"))))))) + (synopsis "The Khronos OpenCL headers") + (description "This package provides the Khronos OpenCL headers") + (home-page "https://www.khronos.org/registry/cl/") + (license (list license:gpl2))))) -- cgit v1.2.3 From da665e5a94c59ff4cab6c7f3b88c102a3d15c968 Mon Sep 17 00:00:00 2001 From: Dennis E. Mungai Date: Fri, 18 Mar 2016 23:56:29 +0300 Subject: Added clBLAS Build fails due to googletest's missing target "install". Investigating.--- gn/packages/clBLAS.scm | 186 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) create mode 100644 gn/packages/clBLAS.scm diff --git a/gn/packages/clBLAS.scm b/gn/packages/clBLAS.scm new file mode 100644 index 0000000..561ee2b --- /dev/null +++ b/gn/packages/clBLAS.scm @@ -0,0 +1,186 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Dennis Mungai +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gn packages clBLAS) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) + #:use-module (guix packages) + #:use-module (gnu packages algebra) + #:use-module (gnu packages bootstrap) + #:use-module (gnu packages base) + #:use-module (gnu packages autotools) + #:use-module (gnu packages curl) + #:use-module (gnu packages gawk) + #:use-module (gnu packages cmake) + #:use-module (gnu packages boost) + #:use-module (gnu packages glib) + #:use-module (gnu packages image) + #:use-module (gnu packages video) + #:use-module (gnu packages textutils) + #:use-module (gnu packages gl) + #:use-module (gnu packages gcc) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages maths) + #:use-module (gnu packages mpi) + #:use-module (gnu packages ruby) + #:use-module (gnu packages web) + #:use-module (gnu packages python) + #:use-module (gnu packages xorg) + #:use-module (gnu packages version-control) + #:use-module (gnu packages zip) + #:use-module (gnu packages linux)) + +(define-public clBLAS + (package + (name "clBLAS") + (version "v2.10") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/clMathLibraries/clBLAS/archive/" + version ".tar.gz")) + (sha256 + (base32 + "0adlb02lqzrklfybhnv4n0p37mvkvdi3vqiwa05x2mv05ywnr93j")))) + (build-system cmake-build-system) + (arguments `(#:configure-flags '("../clBLAS-2.10/src" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=Release") #:tests? #f)) + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("cmake" ,cmake) + ("gfortran" ,gfortran) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs `(("curl" ,curl) + ("dbus" ,dbus) + ("enca" ,enca) + ("eudev" ,eudev) + ("fftw-openmpi" ,fftw-openmpi) + ("glew" ,glew) + ("googletest" ,googletest) + ("libcap" ,libcap) + ("libjpeg" ,libjpeg) + ("libltdl" ,libltdl) + ("libtiff" ,libtiff) + ("mesa-utils" ,mesa-utils) + ("openmpi" ,openmpi) + ("ocl-icd" ,ocl-icd) + ("openblas" ,openblas) + ("opencl-headers" ,opencl-headers) + ("randrproto" ,randrproto) + ("libxrandr" ,libxrandr) + ("xineramaproto" ,xineramaproto) + ("libxinerama" ,libxinerama) + ("libxcursor" ,libxcursor) + ("python" ,python-2))) + (home-page "http://www.glfw.org/") + (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.") + (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.") + (license (list license:gpl2)))) + +(define-public ocl-icd + (package + (name "ocl-icd") + (version "2.2.9") + (source (origin + (method url-fetch) + (uri (string-append "https://forge.imag.fr/frs/download.php/716/ocl-icd-" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc")))) + (inputs `(("zip" ,zip) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("ruby" ,ruby) + ("libtool" ,libtool) + ("opencl-headers" ,opencl-headers) + ("libgcrypt" ,libgcrypt))) + (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack `bootstrap + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) + (home-page "https://forge.imag.fr/projects/ocl-icd/") + (synopsis "OpenCL implementations are provided as ICD (Installable Client Driver).") + (description "OpenCL implementations are provided as ICD (Installable Client Driver). + An OpenCL program can use several ICD thanks to the use of an ICD Loader as provided by this project. + This free ICD Loader can load any (free or non free) ICD") + (license (list license:gpl2 license:ruby)))) + +(define-public opencl-headers +(let ((commit "c1770dc")) + (package + (name "opencl-headers") + (version (string-append "2.1-" commit )) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/OpenCL-Headers.git") + (commit commit))) + (file-name (string-append name "-" commit)) + (sha256 + (base32 + "0m9fkblqja0686i2jjqiszvq3df95gp01a2674xknlmkd6525rck")))) + (propagated-inputs '()) + (inputs '()) + (native-inputs '()) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "." (string-append + (assoc-ref outputs "out") + "/include/CL"))))))) + (synopsis "The Khronos OpenCL headers") + (description "This package provides the Khronos OpenCL headers") + (home-page "https://www.khronos.org/registry/cl/") + (license (list license:gpl2))))) + +(define-public googletest + (package + (name "googletest") + (version "1.7.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/google/googletest/archive/release-" + version ".tar.gz")) + (sha256 + (base32 + "1k0nf1l9cb3prdmsvaajl5i31bx86c1mw0d5jgzykz7rzm36afpp")))) + (build-system cmake-build-system) + (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=RelWithDebInfo") #:tests? #f)) + (inputs `(("automake" ,automake) + ("autoconf" ,autoconf) + ("libtool" ,libtool) + ("cmake" ,cmake) + ("python" ,python-2) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/google/googletest") + (synopsis "Google's C++ test framework") + (description "Google's C++ test framework") + (license (list license:gpl2)))) -- cgit v1.2.3 From 002fbd72657b07802627f76eff4280e03be86323 Mon Sep 17 00:00:00 2001 From: pjotrp Date: Fri, 18 Mar 2016 22:18:02 -0500 Subject: fix conflict --- gn/packages/pocl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gn/packages/pocl.scm b/gn/packages/pocl.scm index 39f16c0..7d61526 100644 --- a/gn/packages/pocl.scm +++ b/gn/packages/pocl.scm @@ -52,7 +52,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages ruby) #:use-module (gnu packages gnupg) - #:use-module (gnu packages zip) + #:use-module ((gnu packages zip) #:prefix gnuzip:) #:use-module (gnu packages linux)) (define-public pocl @@ -131,7 +131,7 @@ (sha256 (base32 "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc")))) - (inputs `(("zip" ,zip) + (inputs `(("zip" ,gnuzip:zip) ("autoconf" ,autoconf) ("automake" ,automake) ("ruby" ,ruby) -- cgit v1.2.3 From ccf36e62ae12fe0a1ce90f33087e0d2ccd797b72 Mon Sep 17 00:00:00 2001 From: Dennis E. Mungai Date: Sat, 19 Mar 2016 12:19:08 +0300 Subject: ported gtest to guix Cleanup pending. Package builds. Need to trim inputs.--- gn/packages/gtest.scm | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 gn/packages/gtest.scm diff --git a/gn/packages/gtest.scm b/gn/packages/gtest.scm new file mode 100644 index 0000000..f8b34e9 --- /dev/null +++ b/gn/packages/gtest.scm @@ -0,0 +1,76 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Dennis Mungai +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gn packages gtest) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) + #:use-module (guix packages) + #:use-module (gnu packages algebra) + #:use-module (gnu packages bootstrap) + #:use-module (gnu packages base) + #:use-module (gnu packages autotools) + #:use-module (gnu packages curl) + #:use-module (gnu packages gawk) + #:use-module (gnu packages cmake) + #:use-module (gnu packages boost) + #:use-module (gnu packages glib) + #:use-module (gnu packages image) + #:use-module (gnu packages video) + #:use-module (gnu packages textutils) + #:use-module (gnu packages gl) + #:use-module (gnu packages gcc) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages maths) + #:use-module (gnu packages mpi) + #:use-module (gnu packages ruby) + #:use-module (gnu packages web) + #:use-module (gnu packages python) + #:use-module (gnu packages xorg) + #:use-module (gnu packages version-control) + #:use-module (gnu packages zip) + #:use-module (gnu packages linux)) + +(define-public gtest + (let ((revision "1") + (commit "13206d6f53aaff844f2d3595a01ac83a29e383db")) + (package + (name "gtest") + (version (string-append "1.7.0." revision "." commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/google/googletest.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1v73r7wm9q9kpjbpbk0qs15703y2caaz6dkvz9bkn7nnv98jbqqc")))) + (build-system cmake-build-system) + (native-inputs + `(("python" ,python-wrapper))) + (synopsis "") + (description + "") + (home-page "") + (license license:expat)))) -- cgit v1.2.3 From af893ffe2cda7b90826c215ee3b57308cb2c6d56 Mon Sep 17 00:00:00 2001 From: Dennis E. Mungai Date: Sat, 19 Mar 2016 12:38:19 +0300 Subject: Fixes. Package still fails to build Investigate and patch later.--- gn/packages/clBLAS.scm | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/gn/packages/clBLAS.scm b/gn/packages/clBLAS.scm index 561ee2b..9a04c75 100644 --- a/gn/packages/clBLAS.scm +++ b/gn/packages/clBLAS.scm @@ -61,7 +61,8 @@ (base32 "0adlb02lqzrklfybhnv4n0p37mvkvdi3vqiwa05x2mv05ywnr93j")))) (build-system cmake-build-system) - (arguments `(#:configure-flags '("../clBLAS-2.10/src" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=Release") #:tests? #f)) + (arguments `(#:configure-flags '("../clBLAS-2.10/src" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=Release") + #:tests? #f)) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("cmake" ,cmake) @@ -70,11 +71,11 @@ ("pkg-config" ,pkg-config))) (inputs `(("curl" ,curl) ("dbus" ,dbus) + ("boost" ,boost) ("enca" ,enca) ("eudev" ,eudev) ("fftw-openmpi" ,fftw-openmpi) - ("glew" ,glew) - ("googletest" ,googletest) + ("glew" ,glew) ("libcap" ,libcap) ("libjpeg" ,libjpeg) ("libltdl" ,libltdl) @@ -82,7 +83,6 @@ ("mesa-utils" ,mesa-utils) ("openmpi" ,openmpi) ("ocl-icd" ,ocl-icd) - ("openblas" ,openblas) ("opencl-headers" ,opencl-headers) ("randrproto" ,randrproto) ("libxrandr" ,libxrandr) @@ -161,26 +161,4 @@ (home-page "https://www.khronos.org/registry/cl/") (license (list license:gpl2))))) -(define-public googletest - (package - (name "googletest") - (version "1.7.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/google/googletest/archive/release-" - version ".tar.gz")) - (sha256 - (base32 - "1k0nf1l9cb3prdmsvaajl5i31bx86c1mw0d5jgzykz7rzm36afpp")))) - (build-system cmake-build-system) - (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=RelWithDebInfo") #:tests? #f)) - (inputs `(("automake" ,automake) - ("autoconf" ,autoconf) - ("libtool" ,libtool) - ("cmake" ,cmake) - ("python" ,python-2) - ("pkg-config" ,pkg-config))) - (home-page "https://github.com/google/googletest") - (synopsis "Google's C++ test framework") - (description "Google's C++ test framework") - (license (list license:gpl2)))) + -- cgit v1.2.3 From 10864b70d6ab88b2efe479be8beff1ee8a8503d4 Mon Sep 17 00:00:00 2001 From: Dennis E. Mungai Date: Sat, 19 Mar 2016 13:17:43 +0300 Subject: Package successfully ported to GNU Guix Praise the sun !--- gn/packages/clBLAS.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gn/packages/clBLAS.scm b/gn/packages/clBLAS.scm index 9a04c75..17a4589 100644 --- a/gn/packages/clBLAS.scm +++ b/gn/packages/clBLAS.scm @@ -61,8 +61,8 @@ (base32 "0adlb02lqzrklfybhnv4n0p37mvkvdi3vqiwa05x2mv05ywnr93j")))) (build-system cmake-build-system) - (arguments `(#:configure-flags '("../clBLAS-2.10/src" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=Release") - #:tests? #f)) + (arguments `(#:tests? #f + #:configure-flags '("../clBLAS-2.10/src" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_TEST=OFF"))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("cmake" ,cmake) -- cgit v1.2.3 From 52516f78d847eb3a770b75800471d6ef6688b1a5 Mon Sep 17 00:00:00 2001 From: Dennis E. Mungai Date: Sat, 19 Mar 2016 14:08:47 +0300 Subject: Broken build, still cannot detect Boost.Compute To be fixed. To build, you need to disable the OpenCL back-end.--- gn/packages/arrayfire.scm | 144 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 143 insertions(+), 1 deletion(-) diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm index a581389..5339030 100644 --- a/gn/packages/arrayfire.scm +++ b/gn/packages/arrayfire.scm @@ -37,9 +37,11 @@ #:use-module (gnu packages video) #:use-module (gnu packages textutils) #:use-module (gnu packages gl) + #:use-module (gnu packages gcc) #:use-module (gnu packages gnupg) #:use-module (gnu packages pkg-config) #:use-module (gnu packages maths) + #:use-module (gnu packages mpi) #:use-module (gnu packages web) #:use-module (gnu packages wget) #:use-module (gnu packages python) @@ -70,7 +72,10 @@ ("pkg-config" ,pkg-config))) (inputs `(("boost" ,boost) ("glfw" ,glfw) + ("compute" ,compute) ("curl" ,curl) + ("clBLAS" ,clBLAS) + ("clFFT" ,clFFT) ("atlas" ,atlas) ("dbus" ,dbus) ("opencl-headers" ,opencl-headers) @@ -100,7 +105,7 @@ ("cmake" ,cmake))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DBUILD_OPENCL=OFF" "-DBUILD_CUDA=OFF" "-DBUILD_GRAPHICS=OFF") + `(#:configure-flags '("-DBUILD_OPENCL=ON" "-DBUILD_CUDA=OFF" "-DBUILD_GRAPHICS=OFF") #:tests? #f)) (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com") (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.") @@ -152,6 +157,139 @@ (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.") (license (list license:gpl2)))) +(define-public clBLAS + (package + (name "clBLAS") + (version "v2.10") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/clMathLibraries/clBLAS/archive/" + version ".tar.gz")) + (sha256 + (base32 + "0adlb02lqzrklfybhnv4n0p37mvkvdi3vqiwa05x2mv05ywnr93j")))) + (build-system cmake-build-system) + (arguments `(#:tests? #f + #:configure-flags '("../clBLAS-2.10/src" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_TEST=OFF"))) + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("cmake" ,cmake) + ("gfortran" ,gfortran) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs `(("curl" ,curl) + ("dbus" ,dbus) + ("boost" ,boost) + ("enca" ,enca) + ("eudev" ,eudev) + ("fftw-openmpi" ,fftw-openmpi) + ("glew" ,glew) + ("libcap" ,libcap) + ("libjpeg" ,libjpeg) + ("libltdl" ,libltdl) + ("libtiff" ,libtiff) + ("mesa-utils" ,mesa-utils) + ("openmpi" ,openmpi) + ("ocl-icd" ,ocl-icd) + ("opencl-headers" ,opencl-headers) + ("randrproto" ,randrproto) + ("libxrandr" ,libxrandr) + ("xineramaproto" ,xineramaproto) + ("libxinerama" ,libxinerama) + ("libxcursor" ,libxcursor) + ("python" ,python-2))) + (home-page "http://www.glfw.org/") + (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.") + (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.") + (license (list license:gpl2)))) + +(define-public clFFT + (package + (name "clFFT") + (version "v2.10.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/clMathLibraries/clFFT/archive/" + version ".tar.gz")) + (sha256 + (base32 + "19hrk1lf06kch8x9dpbdj0waycn2mldrmj2y4vzi7zn2gdfw6g73")))) + (build-system cmake-build-system) + (arguments `(#:configure-flags '("../clFFT-2.10.1/src" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=Release") #:tests? #f)) + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("cmake" ,cmake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs `(("curl" ,curl) + ("dbus" ,dbus) + ("enca" ,enca) + ("eudev" ,eudev) + ("fftw-openmpi" ,fftw-openmpi) + ("glew" ,glew) + ("libcap" ,libcap) + ("libjpeg" ,libjpeg) + ("libltdl" ,libltdl) + ("libtiff" ,libtiff) + ("mesa-utils" ,mesa-utils) + ("openmpi" ,openmpi) + ("ocl-icd" ,ocl-icd) + ("opencl-headers" ,opencl-headers) + ("randrproto" ,randrproto) + ("libxrandr" ,libxrandr) + ("xineramaproto" ,xineramaproto) + ("libxinerama" ,libxinerama) + ("libxcursor" ,libxcursor) + ("python" ,python-2))) + (home-page "http://www.glfw.org/") + (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.") + (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.") + (license (list license:gpl2)))) + +(define-public compute + (package + (name "compute") + (version "v0.5") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/boostorg/compute/archive/" + version ".tar.gz")) + (sha256 + (base32 + "1r16zd1wdnn9gx278mkvr13k3i79hr35v6vj0fn7v3n92ngwxnhd")))) + (build-system cmake-build-system) + (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=Release") #:tests? #f)) + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("cmake" ,cmake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs `(("curl" ,curl) + ("dbus" ,dbus) + ("enca" ,enca) + ("eudev" ,eudev) + ("fftw-openmpi" ,fftw-openmpi) + ("glew" ,glew) + ("boost" ,boost) + ("libcap" ,libcap) + ("libjpeg" ,libjpeg) + ("libltdl" ,libltdl) + ("libtiff" ,libtiff) + ("mesa-utils" ,mesa-utils) + ("openmpi" ,openmpi) + ("opencl-headers" ,opencl-headers) + ("ocl-icd" ,ocl-icd) + ("randrproto" ,randrproto) + ("libxrandr" ,libxrandr) + ("xineramaproto" ,xineramaproto) + ("libxinerama" ,libxinerama) + ("libxcursor" ,libxcursor) + ("python" ,python-2))) + (home-page "http://boost.org") + (synopsis "Peer-reviewed portable C++ source libraries,BoostCompute") + (description "Peer-reviewed portable C++ source libraries,BoostCompute") + (license (list license:x11-style)))) + (define-public ocl-icd (package (name "ocl-icd") @@ -217,4 +355,8 @@ (description "This package provides the Khronos OpenCL headers") (home-page "https://www.khronos.org/registry/cl/") (license (list license:gpl2))))) + + + + -- cgit v1.2.3 From 931b0f2bf9f082a200c3422ffb3f4f8e1da7137c Mon Sep 17 00:00:00 2001 From: Dennis E. Mungai Date: Sat, 19 Mar 2016 14:29:47 +0300 Subject: Use the system's Boost Compute library as an input See the CMake configuration string for details. Investigating a latent build failure.--- gn/packages/arrayfire.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm index 5339030..135ba0e 100644 --- a/gn/packages/arrayfire.scm +++ b/gn/packages/arrayfire.scm @@ -105,7 +105,7 @@ ("cmake" ,cmake))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DBUILD_OPENCL=ON" "-DBUILD_CUDA=OFF" "-DBUILD_GRAPHICS=OFF") + `(#:configure-flags '("-DBUILD_OPENCL=ON" "-DBUILD_CUDA=OFF" "-DBUILD_GRAPHICS=OFF" "-DUSE_SYSTEM_BOOST_COMPUTE=ON") #:tests? #f)) (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com") (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.") -- cgit v1.2.3 From 6e33d4f2ba7d40c1eb7e4459cd2c95145ca4a2f1 Mon Sep 17 00:00:00 2001 From: Dennis E. Mungai Date: Sat, 19 Mar 2016 14:59:27 +0300 Subject: Add more native deps See the cmake configuration options used.--- gn/packages/arrayfire.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm index 135ba0e..e8dfaba 100644 --- a/gn/packages/arrayfire.scm +++ b/gn/packages/arrayfire.scm @@ -105,7 +105,7 @@ ("cmake" ,cmake))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DBUILD_OPENCL=ON" "-DBUILD_CUDA=OFF" "-DBUILD_GRAPHICS=OFF" "-DUSE_SYSTEM_BOOST_COMPUTE=ON") + `(#:configure-flags '("-DBUILD_OPENCL=ON" "-DBUILD_CUDA=OFF" "-DBUILD_GRAPHICS=OFF" "-DUSE_SYSTEM_BOOST_COMPUTE=ON" "-DUSE_SYSTEM_CLBLAS=ON" "-DUSE_SYSTEM_CLFFT=ON") #:tests? #f)) (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com") (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.") -- cgit v1.2.3 From dfe1f18aecbc1bb8317f021b78e4757e37bd1538 Mon Sep 17 00:00:00 2001 From: Dennis E. Mungai Date: Sat, 19 Mar 2016 15:24:17 +0300 Subject: Arrayfire now builds on GNU Guix Mission accomplished. Praise the sun!!!--- gn/packages/arrayfire.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm index e8dfaba..c5326fa 100644 --- a/gn/packages/arrayfire.scm +++ b/gn/packages/arrayfire.scm @@ -108,7 +108,7 @@ `(#:configure-flags '("-DBUILD_OPENCL=ON" "-DBUILD_CUDA=OFF" "-DBUILD_GRAPHICS=OFF" "-DUSE_SYSTEM_BOOST_COMPUTE=ON" "-DUSE_SYSTEM_CLBLAS=ON" "-DUSE_SYSTEM_CLFFT=ON") #:tests? #f)) (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com") - (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.") + (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.Now on Guix") (home-page "http://arrayfire.com/") (license (list license:gpl2 license:gpl2+ -- cgit v1.2.3 From d3418e836947fe307d4dc7b16062a2cfbf562709 Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Tue, 22 Mar 2016 14:12:38 -0500 Subject: Fixed and added erlang --- gn/packages/arrayfire.scm | 2 +- gn/packages/erlang.scm | 132 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 gn/packages/erlang.scm diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm index 446669c..361f2f0 100644 --- a/gn/packages/arrayfire.scm +++ b/gn/packages/arrayfire.scm @@ -109,7 +109,7 @@ (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_OPENCL=ON" "-DBUILD_CUDA=OFF" "-DBUILD_GRAPHICS=OFF" "-DUSE_SYSTEM_BOOST_COMPUTE=ON" "-DUSE_SYSTEM_CLBLAS=ON" "-DUSE_SYSTEM_CLFFT=ON") - #:tests? #f)) + #:tests? #t)) (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com") (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.Now on Guix") (home-page "http://arrayfire.com/") diff --git a/gn/packages/erlang.scm b/gn/packages/erlang.scm new file mode 100644 index 0000000..ebf98cf --- /dev/null +++ b/gn/packages/erlang.scm @@ -0,0 +1,132 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Steve Sprang +;;; Copyright © 2016 Leo Famulari +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gn packages erlang) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages perl) + #:use-module (gnu packages tls)) + +(define-public erlang + ;; Keep in sync with 'erlang-manpages'! + (package + (name "erlang") + (version "18.3") + (source (origin + (method url-fetch) + (uri (string-append + "http://erlang.org/download/otp_src_" + version + ".tar.gz")) + (sha256 + (base32 + "1hy9slq9gjvwdb504dmvp6rax90isnky6chqkyq5v4ybl4lq3azx")))) + (build-system gnu-build-system) + (native-inputs + `(("perl" ,perl))) + (inputs + `(("ncurses" ,ncurses) + ("openssl" ,openssl))) + (arguments + `(#:configure-flags + (list (string-append "--with-ssl=" (assoc-ref %build-inputs "openssl"))) + #:phases + (modify-phases %standard-phases + (add-after 'patch-source-shebangs 'patch-source-env + (lambda _ + (let ((escripts + (append + (find-files "." "\\.escript") + (find-files "lib/stdlib/test/escript_SUITE_data/") + '("erts/lib_src/utils/make_atomics_api" + "erts/preloaded/src/add_abstract_code" + "lib/diameter/bin/diameterc" + "lib/reltool/examples/display_args" + "lib/reltool/examples/mnesia_core_dump_viewer" + "lib/snmp/src/compile/snmpc.src" + "make/verify_runtime_dependencies" + "make/emd2exml.in")))) + (substitute* escripts + (("/usr/bin/env") (which "env")))))) + (add-after 'unpack 'path-to-rm + (lambda _ + (substitute* "erts/configure" + (("/bin/rm") (which "rm"))) + (substitute* "lib/odbc/configure" + (("/bin/rm") (which "rm"))))) + (add-before 'configure 'set-erl-top + (lambda _ + (setenv "ERL_TOP" (getcwd)))) + (add-after 'install 'patch-erl + ;; This only works after install. + (lambda _ + (substitute* (string-append (assoc-ref %outputs "out") "/bin/erl") + (("sed") (which "sed")))))) + #:test-target "release_tests")) + (home-page "http://erlang.org/") + (synopsis "The Erlang programming language") + (description + "Erlang is a programming language used to build massively +scalable soft real-time systems with requirements on high +availability. Some of its uses are in telecoms, banking, e-commerce, +computer telephony and instant messaging. Erlang's runtime system has +built-in support for concurrency, distribution and fault tolerance.") + (license license:asl2.0))) + +(define-public erlang-manpages + ;; Keep in sync with 'erlang'! + (package + (name "erlang-manpages") + (version (package-version erlang)) + (source (origin + (method url-fetch) + (uri (string-append "http://erlang.org/download/otp_doc_man_" + version ".tar.gz")) + (sha256 + (base32 + "1hpcr7a3dx2y9gnb53bvb4g6lyvbwigadl9s3f978s01x40f32wp")))) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((gz (assoc-ref %build-inputs "gzip")) + (tar (assoc-ref %build-inputs "tar")) + (out (assoc-ref %outputs "out")) + (man (string-append out "/share/man"))) + (setenv "PATH" (string-append tar "/bin:" gz "/bin")) + (mkdir-p man) + (with-directory-excursion man + (zero? (system* "tar" "xvf" + (assoc-ref %build-inputs "source")))) + (delete-file (string-append man "/PR.template")) + (delete-file (string-append man "/README")))))) + (native-inputs `(("tar" ,tar) + ("gzip" ,gzip))) + (synopsis "Man pages of Erlang") + (description "This provides the man pages of Erlang.") + (home-page (package-home-page erlang)) + (license license:asl2.0))) -- cgit v1.2.3