mirror of
git://git.savannah.gnu.org/guix.git
synced 2023-12-14 03:33:07 +01:00
gnu: guile-aiscm: Update to 0.24.2.
* gnu/packages/machine-learning.scm (guile-aiscm): Update to 0.24.2. [arguments]: Add configure flags for OpenCV modules; add build phase 'find-clearsilver; adjust phase 'use-llvm-config; add phase 'disable-broken-test. [inputs]: Add clearsilver, libgc, opencv, and tensorflow; replace ffmpeg with ffmpeg-4. [native-inputs]: Add protobuf-c; replace clang-13 and llvm-13 with clang-11 and llvm-11, respectively.
This commit is contained in:
parent
97bbb9d603
commit
0d7f2469b5
1 changed files with 51 additions and 9 deletions
|
@ -295,19 +295,36 @@ training, HMM clustering, HMM mixtures.")
|
|||
(define-public guile-aiscm
|
||||
(package
|
||||
(name "guile-aiscm")
|
||||
(version "0.23.1")
|
||||
(version "0.24.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/wedesoft/aiscm")
|
||||
(commit "c78b91edb7c17c6fbf3b294452f44e91d75e3c67")))
|
||||
(commit "2e16e38391bf1638f1dd9a1cf4b25a25f6626078")))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"09rdbcr8dinzijyx9h940ann91yjlbg0fangx365llhvy354n840"))))
|
||||
"1gwqpzl6irpaszkpxaf5wliwq19280632hlgxs3ikjkfg8mkqql0"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:configure-flags
|
||||
#~(list (string-append "OPENCV_CFLAGS=-I" #$(this-package-input "opencv")
|
||||
"/include/opencv4")
|
||||
(let ((modules
|
||||
(list "aruco" "barcode" "bgsegm" "bioinspired"
|
||||
"calib3d" "ccalib" "core" "datasets" "dnn"
|
||||
"dnn_objdetect" "dnn_superres" "dpm" "face"
|
||||
"features2d" "flann" "freetype" "fuzzy" "hdf"
|
||||
"hfs" "highgui" "img_hash" "imgcodecs" "imgproc"
|
||||
"intensity_transform" "line_descriptor" "mcc"
|
||||
"ml" "objdetect" "optflow" "phase_unwrapping"
|
||||
"photo" "plot" "quality" "rapid" "reg" "rgbd"
|
||||
"saliency" "shape" "stereo" "stitching"
|
||||
"structured_light" "superres" "surface_matching"
|
||||
"text" "tracking" "video" "videoio" "videostab"
|
||||
"wechat_qrcode" "ximgproc" "xobjdetect" "xphoto")))
|
||||
(format #false "OPENCV_LIBS=~{-lopencv_~a~^ ~}" modules)))
|
||||
#:make-flags
|
||||
#~(list (string-append "GUILE_CACHE=" #$output "/lib/guile/3.0/site-ccache")
|
||||
(string-append "GUILE_EXT=" #$output "/lib/guile/3.0/extensions")
|
||||
|
@ -318,10 +335,23 @@ training, HMM clustering, HMM mixtures.")
|
|||
(lambda _
|
||||
(substitute* "doc/Makefile.am"
|
||||
(("\\$\\(DATE\\)") "1970-01-01"))))
|
||||
(add-after 'unpack 'find-clearsilver
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "configure.ac"
|
||||
(("/usr/local/include/ClearSilver")
|
||||
(string-append (assoc-ref inputs "clearsilver")
|
||||
"/include/ClearSilver")))
|
||||
(substitute* "aiscm/Makefile.am"
|
||||
(("-lneo_utl" m)
|
||||
(string-append m " -lstreamhtmlparser")))
|
||||
(setenv "C_INCLUDE_PATH"
|
||||
(string-append (assoc-ref inputs "clearsilver")
|
||||
"/include/ClearSilver:"
|
||||
(or (getenv "C_INCLUDE_PATH") "")))))
|
||||
(add-after 'unpack 'use-llvm-config
|
||||
(lambda _
|
||||
(substitute* "m4/ax_llvmc.m4"
|
||||
(("llvm-config-13") "llvm-config")
|
||||
(("llvm-config-11") "llvm-config")
|
||||
;; For some reason this library is not on the link list.
|
||||
(("(LLVM_LIBS=\"\\$\\(\\$ac_llvm_config_path --libs \\$1\\))\"" _ m)
|
||||
(string-append m " -lLLVMMCJIT\"")))
|
||||
|
@ -329,10 +359,17 @@ training, HMM clustering, HMM mixtures.")
|
|||
;; Because of this message:
|
||||
;; symbol lookup error: ./.libs/libguile-aiscm-core.so: undefined symbol: LLVMInitializeX86TargetInfo
|
||||
;; This probably needs to differ when building on architectures
|
||||
;; other than x86_64p
|
||||
;; other than x86_64.
|
||||
(substitute* "aiscm/Makefile.am"
|
||||
(("LLVM_LIBS\\)") "LLVM_LIBS) \
|
||||
-lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMX86Desc -lLLVMX86Info"))))
|
||||
;; This test fails because our version of tensorflow is too old
|
||||
;; to provide tf-string-length.
|
||||
(add-after 'unpack 'disable-broken-test
|
||||
(lambda _
|
||||
(substitute* "tests/test_tensorflow.scm"
|
||||
(("\\(test-eqv \"determine string length" m)
|
||||
(string-append "#;" m)))))
|
||||
;; Use Clang instead of GCC.
|
||||
(add-before 'configure 'prepare-build-environment
|
||||
(lambda _
|
||||
|
@ -341,10 +378,12 @@ training, HMM clustering, HMM mixtures.")
|
|||
(setenv "CC" "clang")
|
||||
(setenv "CXX" "clang++"))))))
|
||||
(inputs
|
||||
(list ffmpeg
|
||||
(list clearsilver
|
||||
ffmpeg-4
|
||||
freeglut
|
||||
guile-3.0
|
||||
imagemagick
|
||||
libgc
|
||||
libjpeg-turbo
|
||||
libomp
|
||||
libxi
|
||||
|
@ -354,12 +393,15 @@ training, HMM clustering, HMM mixtures.")
|
|||
libxv
|
||||
mesa
|
||||
mjpegtools
|
||||
opencv
|
||||
pandoc
|
||||
pulseaudio))
|
||||
pulseaudio
|
||||
tensorflow))
|
||||
(native-inputs
|
||||
(list clang-13
|
||||
llvm-13
|
||||
(list clang-11
|
||||
llvm-11
|
||||
pkg-config
|
||||
protobuf-c
|
||||
autoconf
|
||||
automake
|
||||
gettext-minimal
|
||||
|
|
Loading…
Reference in a new issue