mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-11 21:59:08 -05: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 @@ (define-public ghmm
|
||||||
(define-public guile-aiscm
|
(define-public guile-aiscm
|
||||||
(package
|
(package
|
||||||
(name "guile-aiscm")
|
(name "guile-aiscm")
|
||||||
(version "0.23.1")
|
(version "0.24.2")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
(url "https://github.com/wedesoft/aiscm")
|
(url "https://github.com/wedesoft/aiscm")
|
||||||
(commit "c78b91edb7c17c6fbf3b294452f44e91d75e3c67")))
|
(commit "2e16e38391bf1638f1dd9a1cf4b25a25f6626078")))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"09rdbcr8dinzijyx9h940ann91yjlbg0fangx365llhvy354n840"))))
|
"1gwqpzl6irpaszkpxaf5wliwq19280632hlgxs3ikjkfg8mkqql0"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(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
|
#:make-flags
|
||||||
#~(list (string-append "GUILE_CACHE=" #$output "/lib/guile/3.0/site-ccache")
|
#~(list (string-append "GUILE_CACHE=" #$output "/lib/guile/3.0/site-ccache")
|
||||||
(string-append "GUILE_EXT=" #$output "/lib/guile/3.0/extensions")
|
(string-append "GUILE_EXT=" #$output "/lib/guile/3.0/extensions")
|
||||||
|
@ -318,10 +335,23 @@ (define-public guile-aiscm
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "doc/Makefile.am"
|
(substitute* "doc/Makefile.am"
|
||||||
(("\\$\\(DATE\\)") "1970-01-01"))))
|
(("\\$\\(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
|
(add-after 'unpack 'use-llvm-config
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "m4/ax_llvmc.m4"
|
(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.
|
;; For some reason this library is not on the link list.
|
||||||
(("(LLVM_LIBS=\"\\$\\(\\$ac_llvm_config_path --libs \\$1\\))\"" _ m)
|
(("(LLVM_LIBS=\"\\$\\(\\$ac_llvm_config_path --libs \\$1\\))\"" _ m)
|
||||||
(string-append m " -lLLVMMCJIT\"")))
|
(string-append m " -lLLVMMCJIT\"")))
|
||||||
|
@ -329,10 +359,17 @@ (define-public guile-aiscm
|
||||||
;; Because of this message:
|
;; Because of this message:
|
||||||
;; symbol lookup error: ./.libs/libguile-aiscm-core.so: undefined symbol: LLVMInitializeX86TargetInfo
|
;; symbol lookup error: ./.libs/libguile-aiscm-core.so: undefined symbol: LLVMInitializeX86TargetInfo
|
||||||
;; This probably needs to differ when building on architectures
|
;; This probably needs to differ when building on architectures
|
||||||
;; other than x86_64p
|
;; other than x86_64.
|
||||||
(substitute* "aiscm/Makefile.am"
|
(substitute* "aiscm/Makefile.am"
|
||||||
(("LLVM_LIBS\\)") "LLVM_LIBS) \
|
(("LLVM_LIBS\\)") "LLVM_LIBS) \
|
||||||
-lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMX86Desc -lLLVMX86Info"))))
|
-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.
|
;; Use Clang instead of GCC.
|
||||||
(add-before 'configure 'prepare-build-environment
|
(add-before 'configure 'prepare-build-environment
|
||||||
(lambda _
|
(lambda _
|
||||||
|
@ -341,10 +378,12 @@ (define-public guile-aiscm
|
||||||
(setenv "CC" "clang")
|
(setenv "CC" "clang")
|
||||||
(setenv "CXX" "clang++"))))))
|
(setenv "CXX" "clang++"))))))
|
||||||
(inputs
|
(inputs
|
||||||
(list ffmpeg
|
(list clearsilver
|
||||||
|
ffmpeg-4
|
||||||
freeglut
|
freeglut
|
||||||
guile-3.0
|
guile-3.0
|
||||||
imagemagick
|
imagemagick
|
||||||
|
libgc
|
||||||
libjpeg-turbo
|
libjpeg-turbo
|
||||||
libomp
|
libomp
|
||||||
libxi
|
libxi
|
||||||
|
@ -354,12 +393,15 @@ (define-public guile-aiscm
|
||||||
libxv
|
libxv
|
||||||
mesa
|
mesa
|
||||||
mjpegtools
|
mjpegtools
|
||||||
|
opencv
|
||||||
pandoc
|
pandoc
|
||||||
pulseaudio))
|
pulseaudio
|
||||||
|
tensorflow))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list clang-13
|
(list clang-11
|
||||||
llvm-13
|
llvm-11
|
||||||
pkg-config
|
pkg-config
|
||||||
|
protobuf-c
|
||||||
autoconf
|
autoconf
|
||||||
automake
|
automake
|
||||||
gettext-minimal
|
gettext-minimal
|
||||||
|
|
Loading…
Reference in a new issue