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