From 0cc843925d59093b70490ccbca5e18bc4174de9c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Jun 2023 19:49:27 +0300 Subject: gn: genecup: Use correct python-h5py. * gn/packages/python.scm (python-h5py-2): New variable. * gn/packages/machine-learning.scm (tensorflow-native): Remove comments. * gn/packages/ratspub.scm (use-corrected-inputs): New procedure. (genecup-with-tensorflow-native, genecup-latest-with-tensorflow-native): Use use-corrected-inputs. --- gn/packages/ratspub.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gn/packages/ratspub.scm') diff --git a/gn/packages/ratspub.scm b/gn/packages/ratspub.scm index af64365..726bc0b 100644 --- a/gn/packages/ratspub.scm +++ b/gn/packages/ratspub.scm @@ -17,6 +17,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gn packages javascript) #:use-module (gn packages machine-learning) + #:use-module (gn packages python) #:use-module (gn packages web)) (define-public ratspub @@ -148,6 +149,13 @@ Association Studies}} catalog are also included in the search. These gene-keyword relationships are presented as an interactive graph and a table.") (license license:expat))) +(define use-corrected-inputs + (package-input-rewriting/spec + ;; Tensorflow-native provides much improved speeds. python-h5py@2 provides + ;; compatibility with our version of tensorflow. + `(("tensorflow" . ,(const tensorflow-native)) + ("python-h5py" . ,(const python-h5py-2))))) + (define-public ratspub-with-tensorflow-native (package (inherit @@ -399,11 +407,11 @@ concepts and a list of keywords for each concept.") (define-public genecup-with-tensorflow-native (package (inherit - (tensowflow-native-instead-of-tensorflow genecup)) + (use-corrected-inputs genecup)) (name "genecup-with-tensorflow-native"))) (define-public genecup-latest-with-tensorflow-native (package (inherit - (tensowflow-native-instead-of-tensorflow genecup-master)) + (use-corrected-inputs genecup-master)) (name "genecup-latest-with-tensorflow-native"))) -- cgit v1.2.3