From 859709f054229f45eba23d1e3c58e6b3037c2172 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Thu, 25 Feb 2016 19:58:41 +0300
Subject: Applied Pjotr's patch.
Applied Pjotr's patch.---
gn/packages/arrayfire.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
(limited to 'gn/packages/arrayfire.scm')
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 c4a22933adfe218e991715a1c1e25d2104c48900 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Sun, 28 Feb 2016 21:37:32 +0300
Subject: Lisp specific fixes.
---
gn/packages/arrayfire.scm | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
(limited to 'gn/packages/arrayfire.scm')
diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 5869a88..e529971 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see .
(define-module (gn packages arrayfire)
- #:use-module (guix packages)
+ #:use-module ((guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
@@ -33,15 +33,12 @@
#: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) - in algebra
- ;; #:use-module (gnu packages fftwf)
#:use-module (gnu packages gl)
#:use-module (gnu packages glew)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages mesa)
#:use-module (gnu packages web)
- #:use-module (gnu packages linux))
+ #:use-module (gnu packages linux)))
(define-public arrayfire
(package
@@ -51,11 +48,13 @@
(method url-fetch)
(uri (string-append "https://github.com/arrayfire/arrayfire/archive/" version
".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0rla0mi5wby8bkpzrj063y6js3d4dlfl3qwfvm8m8skfc21dz52p"))))
(build-system cmake-build-system)
- (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))
+ (arguments
+ `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
@@ -179,7 +178,6 @@
("zlib" ,zlib)))
(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. It is easy to integrate into existing applications and does not lay claim to the main loop.
-GLFW is written in C and has native support for Windows, OS X and many Unix-like systems using the X Window System, such as Linux and FreeBSD.
-GLFW is licensed under the zlib/libpng license.")
+ (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
(license license:gpl2+)))
+
--
cgit v1.2.3
From 0e91d686b2262bf19b15aa64477daad08ae94926 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Sun, 28 Feb 2016 22:42:45 +0300
Subject: Lisp fixes
---
gn/packages/arrayfire.scm | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
(limited to 'gn/packages/arrayfire.scm')
diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index e529971..c82ed5c 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see .
(define-module (gn packages arrayfire)
- #:use-module ((guix packages)
+ #:use-module ((guix packages))
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
@@ -31,14 +31,15 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages image)
#:use-module (gnu packages video)
- #:use-module (gnu packages tls)
+ ;;#:use-module (gnu packages tls)
#:use-module (gnu packages textutils)
#:use-module (gnu packages gl)
- #:use-module (gnu packages glew)
+ ;;#:use-module (gnu packages glew)
#:use-module (gnu packages pkg-config)
- #:use-module (gnu packages mesa)
+ ;;#:use-module (gnu packages mesa)
#:use-module (gnu packages web)
- #:use-module (gnu packages linux)))
+ #:use-module (gnu packages ldc)
+ #:use-module (gnu packages linux))
(define-public arrayfire
(package
@@ -52,11 +53,7 @@
(sha256
(base32
"0rla0mi5wby8bkpzrj063y6js3d4dlfl3qwfvm8m8skfc21dz52p"))))
- (build-system cmake-build-system)
- (arguments
- `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))
- (native-inputs
- `(("autoconf" ,autoconf)
+ (native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
("cmake" ,cmake)
("doxygen" ,doxygen)
@@ -68,8 +65,7 @@
("swig" ,swig)
("which" ,which)
("yasm" ,yasm)))
- (inputs
- `(("boost" ,boost)
+ (inputs `(("boost" ,boost)
("bzip2" ,bzip2)
("glfw" ,glfw)
("curl" ,curl)
@@ -118,7 +114,12 @@
("libxxf86vm" ,libxxf86vm)
("inputproto" ,inputproto)
("glproto" ,glproto)
+ ("cmake" ,cmake)
("zlib" ,zlib)))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))
+
(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/")
@@ -176,6 +177,7 @@
("unzip" ,unzip)
("zip" ,zip)
("zlib" ,zlib)))
+
(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.")
--
cgit v1.2.3
From 5336d44d8727f938aaf913861de4835c0793eac9 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Sun, 28 Feb 2016 23:19:54 +0300
Subject: Update arrayfire.scm
---
gn/packages/arrayfire.scm | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
(limited to 'gn/packages/arrayfire.scm')
diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index c82ed5c..e09fff8 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -17,11 +17,11 @@
;;; along with GNU Guix. If not, see .
(define-module (gn packages arrayfire)
- #:use-module ((guix packages))
+ #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
- #:use-module (guix licenses)
+ #:use-module (guix packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
#:use-module (gnu packages curl)
@@ -118,12 +118,11 @@
("zlib" ,zlib)))
(build-system cmake-build-system)
(arguments
- `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))
-
+ `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))
(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 gpl3+)))
+ (license gpl2+)))
(define-public glfw
(package
@@ -138,14 +137,12 @@
(base32
"1g0jm80cakk60477zz9z1mpsznxaadsfm318yiigf6kackrkqfqg"))))
(arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
- (native-inputs
- `(("autoconf" ,autoconf)
+ (native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
("cmake" ,cmake)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
- (inputs
- `(("bzip2" ,bzip2)
+ (inputs `(("bzip2" ,bzip2)
("curl" ,curl)
("dbus" ,dbus)
("enca" ,enca)
@@ -176,10 +173,9 @@
("tinyxml" ,tinyxml)
("unzip" ,unzip)
("zip" ,zip)
- ("zlib" ,zlib)))
-
+ ("zlib" ,zlib)))
(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 license:gpl2+)))
+ (license gpl2)))
--
cgit v1.2.3
From 2814c72f084f175bbc7cfc401ea59662f1595596 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Mon, 29 Feb 2016 01:48:00 +0300
Subject: Pending work: Fix Licensing stuff.
The build should run, though you'll run into bigger problems with licensing.---
gn/packages/arrayfire.scm | 66 ++++++++---------------------------------------
1 file changed, 11 insertions(+), 55 deletions(-)
(limited to 'gn/packages/arrayfire.scm')
diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index e09fff8..3244680 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see .
(define-module (gn packages arrayfire)
- #:use-module ((guix licenses) #:prefix license:)
+ #:use-module ((guix licenses))
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
@@ -38,7 +38,11 @@
#:use-module (gnu packages pkg-config)
;;#:use-module (gnu packages mesa)
#:use-module (gnu packages web)
+ #:use-module (gnu packages databases)
+ ;;#:use-module (gnu packages lapack)
#:use-module (gnu packages ldc)
+ ;;#:use-module (gnu packages gfortran)
+ #:use-module (gnu packages python)
#:use-module (gnu packages linux))
(define-public arrayfire
@@ -56,64 +60,32 @@
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
("cmake" ,cmake)
- ("doxygen" ,doxygen)
("gawk" ,gawk)
- ("gettext" ,gnu-gettext)
- ("icedtea7" ,icedtea7)
("libtool" ,libtool)
- ("pkg-config" ,pkg-config)
- ("swig" ,swig)
- ("which" ,which)
- ("yasm" ,yasm)))
+ ("pkg-config" ,pkg-config)))
(inputs `(("boost" ,boost)
- ("bzip2" ,bzip2)
("glfw" ,glfw)
("curl" ,curl)
("dbus" ,dbus)
("enca" ,enca)
("eudev" ,eudev)
- ("fontconfig" ,fontconfig)
("freetype" ,freetype)
- ("fribidi" ,fribidi)
("glew" ,glew)
- ("gnutls" ,gnutls)
- ("gperf" ,gperf)
("libcap" ,libcap)
- ("libgcrypt" ,libgcrypt)
("libjpeg" ,libjpeg)
("libltdl" ,libltdl)
- ("libssh" ,libssh)
("libtiff" ,libtiff)
- ("libxml2" ,libxml2)
- ("libxmu" ,libxmu)
- ("libxrandr" ,libxrandr)
- ("libxrender" ,libxrender)
- ("libxslt" ,libxslt)
- ("libxt" ,libxt)
("libyajl" ,libyajl)
- ("lzo" ,lzo)
("mesa-utils" ,mesa-utils)
("mysql" ,mysql)
("openssl" ,openssl)
- ("pcre" ,pcre)
("python" ,python-2)
- ("tinyxml" ,tinyxml)
- ("unzip" ,unzip)
- ("zip" ,zip)
("freeimage" ,freeimage)
("fftw" ,fftw)
("fftwf" ,fftwf)
("fftw-openmpi" ,fftw-openmpi)
- ("atlas" ,atlas)
- ("gfortran", gfortran)
("glew" ,glew)
("glu" ,glu)
- ("libx11" ,libx11)
- ("libxi" ,libxi)
- ("libxrandr" ,libxrandr)
- ("libxxf86vm" ,libxxf86vm)
- ("inputproto" ,inputproto)
- ("glproto" ,glproto)
("cmake" ,cmake)
("zlib" ,zlib)))
(build-system cmake-build-system)
@@ -122,7 +94,7 @@
(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 gpl2+)))
+ (license gpl3+)))
(define-public glfw
(package
@@ -136,46 +108,30 @@
(sha256
(base32
"1g0jm80cakk60477zz9z1mpsznxaadsfm318yiigf6kackrkqfqg"))))
+ (build-system cmake-build-system)
(arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
("cmake" ,cmake)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
- (inputs `(("bzip2" ,bzip2)
- ("curl" ,curl)
+ (inputs `(("curl" ,curl)
("dbus" ,dbus)
("enca" ,enca)
- ("eudev" ,eudev)
- ("fontconfig" ,fontconfig)
("freetype" ,freetype)
- ("fribidi" ,fribidi)
+ ("eudev" ,eudev)
("glew" ,glew)
- ("gnutls" ,gnutls)
- ("gperf" ,gperf)
("libcap" ,libcap)
- ("libgcrypt" ,libgcrypt)
("libjpeg" ,libjpeg)
("libltdl" ,libltdl)
- ("libssh" ,libssh)
("libtiff" ,libtiff)
- ("libxml2" ,libxml2)
- ("libxmu" ,libxmu)
- ("libxrandr" ,libxrandr)
- ("libxrender" ,libxrender)
- ("libxslt" ,libxslt)
- ("libxt" ,libxt)
- ("lzo" ,lzo)
("mesa-utils" ,mesa-utils)
("mysql" ,mysql)
("openssl" ,openssl)
("python" ,python-2)
- ("tinyxml" ,tinyxml)
- ("unzip" ,unzip)
- ("zip" ,zip)
("zlib" ,zlib)))
(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 gpl2)))
+ (license gpl3+)))
--
cgit v1.2.3
From 2b4c04d952bec10c54ee06bcf6692e0f1da47e0b Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Mon, 29 Feb 2016 14:42:35 +0300
Subject: Fixed licensing stuff.
Package can now build. Tracking build dependencies.---
gn/packages/arrayfire.scm | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
(limited to 'gn/packages/arrayfire.scm')
diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 3244680..060339f 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -69,7 +69,6 @@
("dbus" ,dbus)
("enca" ,enca)
("eudev" ,eudev)
- ("freetype" ,freetype)
("glew" ,glew)
("libcap" ,libcap)
("libjpeg" ,libjpeg)
@@ -78,7 +77,6 @@
("libyajl" ,libyajl)
("mesa-utils" ,mesa-utils)
("mysql" ,mysql)
- ("openssl" ,openssl)
("python" ,python-2)
("freeimage" ,freeimage)
("fftw" ,fftw)
@@ -86,15 +84,14 @@
("fftw-openmpi" ,fftw-openmpi)
("glew" ,glew)
("glu" ,glu)
- ("cmake" ,cmake)
- ("zlib" ,zlib)))
+ ("cmake" ,cmake)))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))
(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 gpl3+)))
+ (license (list gpl2 gpl2+ gpl3 gpl3+))))
(define-public glfw
(package
@@ -118,7 +115,6 @@
(inputs `(("curl" ,curl)
("dbus" ,dbus)
("enca" ,enca)
- ("freetype" ,freetype)
("eudev" ,eudev)
("glew" ,glew)
("libcap" ,libcap)
@@ -127,11 +123,9 @@
("libtiff" ,libtiff)
("mesa-utils" ,mesa-utils)
("mysql" ,mysql)
- ("openssl" ,openssl)
- ("python" ,python-2)
- ("zlib" ,zlib)))
+ ("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 gpl3+)))
+ (license (list gpl2))))
--
cgit v1.2.3
From 96ed86cf39e2e973e46edce2c1cb7edce1a2c997 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Mon, 29 Feb 2016 17:08:47 +0300
Subject: Show stopper: Cmake variables for glew search paths
A bug in Arrayfire.
Submitted bug to Arrayfire, waiting for feedback.
An interim patch is in the works and is being tested.---
gn/packages/arrayfire.scm | 41 ++++++++++++++++++++++++-----------------
1 file changed, 24 insertions(+), 17 deletions(-)
(limited to 'gn/packages/arrayfire.scm')
diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 060339f..1a1c9a0 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -31,32 +31,31 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages image)
#:use-module (gnu packages video)
- ;;#:use-module (gnu packages tls)
#:use-module (gnu packages textutils)
#:use-module (gnu packages gl)
- ;;#:use-module (gnu packages glew)
#:use-module (gnu packages pkg-config)
- ;;#:use-module (gnu packages mesa)
+ #:use-module (gnu packages maths)
#:use-module (gnu packages web)
#:use-module (gnu packages databases)
- ;;#:use-module (gnu packages lapack)
#:use-module (gnu packages ldc)
- ;;#:use-module (gnu packages gfortran)
- #:use-module (gnu packages python)
+ #:use-module (gnu packages gcc)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages xorg)
+ #:use-module (gnu packages version-control)
#:use-module (gnu packages linux))
(define-public arrayfire
(package
(name "arrayfire")
- (version "v3.3.alpha")
+ (version "3.3.0")
(source (origin
(method url-fetch)
- (uri (string-append "https://github.com/arrayfire/arrayfire/archive/" version
- ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (uri (string-append "http://arrayfire.com/arrayfire_source/arrayfire-full-" version
+ ".tar.bz2"))
+ (file-name (string-append name "-" version ".tar.bz2"))
(sha256
(base32
- "0rla0mi5wby8bkpzrj063y6js3d4dlfl3qwfvm8m8skfc21dz52p"))))
+ "07pbw6vzny3z86y890c0rx7rk31ddchxrrdslk661iq512xppr0g"))))
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
("cmake" ,cmake)
@@ -70,6 +69,7 @@
("enca" ,enca)
("eudev" ,eudev)
("glew" ,glew)
+ ("lapack" ,lapack)
("libcap" ,libcap)
("libjpeg" ,libjpeg)
("libltdl" ,libltdl)
@@ -84,10 +84,13 @@
("fftw-openmpi" ,fftw-openmpi)
("glew" ,glew)
("glu" ,glu)
+ ("openblas" ,openblas)
+ ("git" ,git)
+ ("gcc" ,gcc)
("cmake" ,cmake)))
(build-system cmake-build-system)
(arguments
- `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON")))
+ `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=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.")
(home-page "http://arrayfire.com/")
@@ -96,17 +99,16 @@
(define-public glfw
(package
(name "glfw")
- (version "3.0.4")
+ (version "3.1.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/glfw/glfw/archive/"
- version ".zip"))
- (file-name (string-append name "-" version ".zip"))
+ version ".tar.gz"))
(sha256
(base32
- "1g0jm80cakk60477zz9z1mpsznxaadsfm318yiigf6kackrkqfqg"))))
+ "08pixv8hd5xsccf7l8cqcijjqaq4k4da8qbp77wggal2fq445ika"))))
(build-system cmake-build-system)
- (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
+ (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON") #:tests? #f))
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
("cmake" ,cmake)
@@ -122,6 +124,11 @@
("libltdl" ,libltdl)
("libtiff" ,libtiff)
("mesa-utils" ,mesa-utils)
+ ("randrproto" ,randrproto)
+ ("libxrandr" ,libxrandr)
+ ("xineramaproto" ,xineramaproto)
+ ("libxinerama" ,libxinerama)
+ ("libxcursor" ,libxcursor)
("mysql" ,mysql)
("python" ,python-2)))
(home-page "http://www.glfw.org/")
--
cgit v1.2.3
From 660b3f26943f22a4d816314738ed0b9c8d595299 Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Mon, 29 Feb 2016 17:25:45 +0300
Subject: Removed obsolete reference to gcc
Not needed as an input, deprecated.---
gn/packages/arrayfire.scm | 2 --
1 file changed, 2 deletions(-)
(limited to 'gn/packages/arrayfire.scm')
diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 1a1c9a0..23ff0af 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -38,7 +38,6 @@
#:use-module (gnu packages web)
#:use-module (gnu packages databases)
#:use-module (gnu packages ldc)
- #:use-module (gnu packages gcc)
#:use-module (gnu packages python)
#:use-module (gnu packages xorg)
#:use-module (gnu packages version-control)
@@ -86,7 +85,6 @@
("glu" ,glu)
("openblas" ,openblas)
("git" ,git)
- ("gcc" ,gcc)
("cmake" ,cmake)))
(build-system cmake-build-system)
(arguments
--
cgit v1.2.3
From da82f38fdc7c4126bac38412ddc4d250475841ab Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Fri, 4 Mar 2016 20:38:48 +0300
Subject: Bumped up to v.3.3.1-hotfix.
Fixes a bunch of build bugs---
gn/packages/arrayfire.scm | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
(limited to 'gn/packages/arrayfire.scm')
diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 23ff0af..f349db3 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -19,6 +19,7 @@
(define-module (gn packages arrayfire)
#:use-module ((guix licenses))
#: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)
@@ -36,7 +37,6 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages maths)
#:use-module (gnu packages web)
- #:use-module (gnu packages databases)
#:use-module (gnu packages ldc)
#:use-module (gnu packages python)
#:use-module (gnu packages xorg)
@@ -44,30 +44,35 @@
#:use-module (gnu packages linux))
(define-public arrayfire
+(let ((commit "9ca1ea0"))
(package
(name "arrayfire")
- (version "3.3.0")
+ (version "3.3.1-hotfix")
(source (origin
- (method url-fetch)
- (uri (string-append "http://arrayfire.com/arrayfire_source/arrayfire-full-" version
- ".tar.bz2"))
- (file-name (string-append name "-" version ".tar.bz2"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/arrayfire/arrayfire.git")
+ (commit commit)))
+ (file-name (string-append name "-" commit))
(sha256
(base32
- "07pbw6vzny3z86y890c0rx7rk31ddchxrrdslk661iq512xppr0g"))))
+ "0b270w9nyf2v7knda94x47c8snf06yb1jlj3cgdv8l5cq1q2bqgm"))))
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
("cmake" ,cmake)
("gawk" ,gawk)
+ ("glew" ,glew)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(inputs `(("boost" ,boost)
("glfw" ,glfw)
("curl" ,curl)
+ ("atlas" ,atlas)
("dbus" ,dbus)
("enca" ,enca)
("eudev" ,eudev)
("glew" ,glew)
+ ("glib" ,glib)
("lapack" ,lapack)
("libcap" ,libcap)
("libjpeg" ,libjpeg)
@@ -75,7 +80,6 @@
("libtiff" ,libtiff)
("libyajl" ,libyajl)
("mesa-utils" ,mesa-utils)
- ("mysql" ,mysql)
("python" ,python-2)
("freeimage" ,freeimage)
("fftw" ,fftw)
@@ -88,11 +92,11 @@
("cmake" ,cmake)))
(build-system cmake-build-system)
(arguments
- `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release -DBUILD_OPENCL=ON") #:tests? #f))
+ `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release" "-DBUILD_OPENCL=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 gpl2 gpl2+ gpl3 gpl3+))))
+ (license (list gpl2 gpl2+ gpl3 gpl3+)))))
(define-public glfw
(package
@@ -104,13 +108,14 @@
version ".tar.gz"))
(sha256
(base32
- "08pixv8hd5xsccf7l8cqcijjqaq4k4da8qbp77wggal2fq445ika"))))
+ "067y98a9s78vpz7xsg889xnwfaza7c5gdv97yg9cgrdl0iljvsgp"))))
(build-system cmake-build-system)
(arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON") #:tests? #f))
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
("cmake" ,cmake)
("libtool" ,libtool)
+ ("libpthread-stubs" ,libpthread-stubs)
("pkg-config" ,pkg-config)))
(inputs `(("curl" ,curl)
("dbus" ,dbus)
@@ -127,7 +132,6 @@
("xineramaproto" ,xineramaproto)
("libxinerama" ,libxinerama)
("libxcursor" ,libxcursor)
- ("mysql" ,mysql)
("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.")
--
cgit v1.2.3
From eb56e3b5d514fd8e352fea18d488e215333c1a6e Mon Sep 17 00:00:00 2001
From: Dennis E. Mungai
Date: Fri, 4 Mar 2016 20:50:00 +0300
Subject: Updated hash values.
Changed with new commits to Arrayfire.---
gn/packages/arrayfire.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'gn/packages/arrayfire.scm')
diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index f349db3..7756a97 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -56,7 +56,7 @@
(file-name (string-append name "-" commit))
(sha256
(base32
- "0b270w9nyf2v7knda94x47c8snf06yb1jlj3cgdv8l5cq1q2bqgm"))))
+ "067y98a9s78vpz7xsg889xnwfaza7c5gdv97yg9cgrdl0iljvsgp"))))
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
("cmake" ,cmake)
@@ -108,7 +108,7 @@
version ".tar.gz"))
(sha256
(base32
- "067y98a9s78vpz7xsg889xnwfaza7c5gdv97yg9cgrdl0iljvsgp"))))
+ "08pixv8hd5xsccf7l8cqcijjqaq4k4da8qbp77wggal2fq445ika"))))
(build-system cmake-build-system)
(arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON") #:tests? #f))
(native-inputs `(("autoconf" ,autoconf)
--
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(-)
(limited to 'gn/packages/arrayfire.scm')
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(-)
(limited to 'gn/packages/arrayfire.scm')
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(-)
(limited to 'gn/packages/arrayfire.scm')
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