aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzimoun <zimon.toutoune@gmail.com>2020-09-11 20:08:39 +0200
committerRicardo Wurmus <rekado@elephly.net>2020-09-11 21:48:38 +0200
commitd3d38bd8f1dfe8d2968c54f081fa6d6c1488a6f1 (patch)
tree5834ce067e9d245ad0b92a32676ecdff6e9cd15c
parentb17ace24cab9724dd43484df2e28432e51755759 (diff)
downloadguix-d3d38bd8f1dfe8d2968c54f081fa6d6c1488a6f1.tar
guix-d3d38bd8f1dfe8d2968c54f081fa6d6c1488a6f1.tar.gz
gnu: r-adaptivesparsity: Move to (gnu packages cran).
* gnu/packages/machine-learning.scm (r-adaptivesparsity): Move from here... * gnu/packages/cran.scm (r-adaptivesparsity): ...to here. Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
-rw-r--r--gnu/packages/cran.scm36
-rw-r--r--gnu/packages/machine-learning.scm36
2 files changed, 36 insertions, 36 deletions
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index f3693fbec5..ddbe56e52f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -23641,6 +23641,42 @@ function that determines the current environment and returns the appropriate
value.")
(license license:gpl3)))
+(define-public r-adaptivesparsity
+ (package
+ (name "r-adaptivesparsity")
+ (version "1.6")
+ (source (origin
+ (method url-fetch)
+ (uri (cran-uri "AdaptiveSparsity" version))
+ (sha256
+ (base32
+ "0imr5m8mll9j6n4icsv6z9rl5kbnwsp9wvzrg7n90nnmcxq2cz91"))))
+ (properties
+ `((upstream-name . "AdaptiveSparsity")))
+ (build-system r-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'link-against-armadillo
+ (lambda _
+ (substitute* "src/Makevars"
+ (("PKG_LIBS=" prefix)
+ (string-append prefix "-larmadillo"))))))))
+ (propagated-inputs
+ `(("r-mass" ,r-mass)
+ ("r-matrix" ,r-matrix)
+ ("r-rcpp" ,r-rcpp)
+ ("r-rcpparmadillo" ,r-rcpparmadillo)))
+ (inputs
+ `(("armadillo" ,armadillo)))
+ (home-page "https://cran.r-project.org/web/packages/AdaptiveSparsity")
+ (synopsis "Adaptive sparsity models")
+ (description
+ "This package implements the Figueiredo machine learning algorithm for
+adaptive sparsity and the Wong algorithm for adaptively sparse gaussian
+geometric models.")
+ (license license:lgpl3+)))
+
(define-public r-workflows
(package
(name "r-workflows")
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 05646dd770..89345fa5fd 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -660,42 +660,6 @@ synchronization, thread-safety, concurrent data structures, and non-blocking
I/O.")
(license license:asl2.0)))
-(define-public r-adaptivesparsity
- (package
- (name "r-adaptivesparsity")
- (version "1.6")
- (source (origin
- (method url-fetch)
- (uri (cran-uri "AdaptiveSparsity" version))
- (sha256
- (base32
- "0imr5m8mll9j6n4icsv6z9rl5kbnwsp9wvzrg7n90nnmcxq2cz91"))))
- (properties
- `((upstream-name . "AdaptiveSparsity")))
- (build-system r-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'link-against-armadillo
- (lambda _
- (substitute* "src/Makevars"
- (("PKG_LIBS=" prefix)
- (string-append prefix "-larmadillo"))))))))
- (propagated-inputs
- `(("r-mass" ,r-mass)
- ("r-matrix" ,r-matrix)
- ("r-rcpp" ,r-rcpp)
- ("r-rcpparmadillo" ,r-rcpparmadillo)))
- (inputs
- `(("armadillo" ,armadillo)))
- (home-page "https://cran.r-project.org/web/packages/AdaptiveSparsity")
- (synopsis "Adaptive sparsity models")
- (description
- "This package implements the Figueiredo machine learning algorithm for
-adaptive sparsity and the Wong algorithm for adaptively sparse gaussian
-geometric models.")
- (license license:lgpl3+)))
-
(define-public gemmlowp-for-tensorflow
;; The commit hash is taken from "tensorflow/workspace.bzl".
(let ((commit "38ebac7b059e84692f53e5938f97a9943c120d98")