diff options
Diffstat (limited to 'machinelearning.scm')
| -rw-r--r-- | machinelearning.scm | 105 |
1 files changed, 53 insertions, 52 deletions
diff --git a/machinelearning.scm b/machinelearning.scm index 52d5bf0..af933f4 100644 --- a/machinelearning.scm +++ b/machinelearning.scm @@ -194,7 +194,7 @@ (define-public stable-diffusion-cpp (package (name "stable-diffusion-cpp") - (version "5eb15ef4d022bef4a391de4f5f6556e81fbb5024") + (version "30b3ac8e6279c128a7a3f8c2627d31b96c2a1185") (source (origin (method git-fetch) @@ -205,9 +205,9 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0q6nmp1dqrlw56b9z887fdnim54vwpn3sw0l057ikmf4ffwdjs8v")))) + "1vpcbf664ak7sz4xbss91dxsnk7cc5n3fyik87zs0sazxs3b1gs2")))) (build-system cmake-build-system) - (inputs (list openblas)) + (inputs (list openblas git-minimal )) (arguments '( #:tests? #f @@ -235,56 +235,57 @@ (let ((bin (string-append (assoc-ref outputs "out") "/bin/sd"))) (when (file-exists? bin) (rename-file bin (string-append (dirname bin) "/sd-vulkan"))))))))) - (inputs (list vulkan-headers vulkan-loader shaderc libomp)))) + (inputs (list vulkan-headers vulkan-loader shaderc libomp)) + )) (define-public exiv2-staticlibs (package (inherit exiv2) - (arguments - `(#:test-target "tests" - #:configure-flags (list "-DEXIV2_BUILD_UNIT_TESTS=ON" - ;; darktable needs BMFF to support - ;; CR3 files. - "-DEXIV2_ENABLE_BMFF=ON") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-gcc-reference - (lambda _ - ;; _GLIBCXX_ASSERTIONS brings reference to GCC. - (substitute* "cmake/compilerFlags.cmake" - (("add_compile_options[(]-Wp,-D_GLIBCXX_ASSERTIONS[)]") - "")))) + (arguments + `(#:test-target "tests" + #:configure-flags (list "-DEXIV2_BUILD_UNIT_TESTS=ON" + ;; darktable needs BMFF to support + ;; CR3 files. + "-DEXIV2_ENABLE_BMFF=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-gcc-reference + (lambda _ + ;; _GLIBCXX_ASSERTIONS brings reference to GCC. + (substitute* "cmake/compilerFlags.cmake" + (("add_compile_options[(]-Wp,-D_GLIBCXX_ASSERTIONS[)]") + "")))) - ,@(if (or (target-ppc64le?) - (target-aarch64?) - (target-riscv64?)) - '((add-after 'unpack 'adjust-tests - (lambda _ - ;; Adjust test on ppc64 and aarch64, where no exception - ;; is raised and thus the return value is different. See - ;; <https://github.com/Exiv2/exiv2/issues/365> and - ;; <https://github.com/Exiv2/exiv2/issues/933>. - (substitute* "tests/bugfixes/github/test_CVE_2018_12265.py" - (("\\$uncaught_exception \\$addition_overflow_message\n") "") - (("retval = \\[1\\]") "retval = [0]"))))) - '())))) + ,@(if (or (target-ppc64le?) + (target-aarch64?) + (target-riscv64?)) + '((add-after 'unpack 'adjust-tests + (lambda _ + ;; Adjust test on ppc64 and aarch64, where no exception + ;; is raised and thus the return value is different. See + ;; <https://github.com/Exiv2/exiv2/issues/365> and + ;; <https://github.com/Exiv2/exiv2/issues/933>. + (substitute* "tests/bugfixes/github/test_CVE_2018_12265.py" + (("\\$uncaught_exception \\$addition_overflow_message\n") "") + (("retval = \\[1\\]") "retval = [0]"))))) + '())))) )) (define-public stable-diffusion-cpp-gui-wx (package - (name "stable-diffusion-cpp-gui-wx") - (version "6f604f836961002fbce72a205c1e6cc6d6a531e9") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/fszontagh/sd.cpp.gui.wx") - (recursive? #t) - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "035zqhjnwdb07ag4chj9zijl70wk81kinqwlnvs9ixb2fzl1z374")))) + (name "stable-diffusion-cpp-gui-wx") + (version "6f604f836961002fbce72a205c1e6cc6d6a531e9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fszontagh/sd.cpp.gui.wx") + (recursive? #t) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "035zqhjnwdb07ag4chj9zijl70wk81kinqwlnvs9ixb2fzl1z374")))) (build-system cmake-build-system) (arguments '( @@ -294,17 +295,17 @@ "-DSD_AVX=ON" "-DWXWIDGETS_VERSION=3.2.5" (string-append "-DWXWIDGETS_EXTRA_PATH=" (assoc-ref %build-inputs "wxwidgets")) - ) + ) #:substitutable? #f ) ) - (native-inputs (list pkg-config)) - (inputs (list openblas openssl curl exiv2-staticlibs wxwidgets gtk+ pangomm git stable-diffusion-cpp)) - (synopsis "cross-platform GUI for Stable Diffusion C++") - (description "A cross-platform GUI for Stable Diffusion C++, built using wxWidgets.") - (home-page "https://stable-diffusion.fsociety.hu") - (license license:expat) - )) + (native-inputs (list pkg-config)) + (inputs (list openblas openssl curl exiv2-staticlibs wxwidgets gtk+ pangomm git stable-diffusion-cpp)) + (synopsis "cross-platform GUI for Stable Diffusion C++") + (description "A cross-platform GUI for Stable Diffusion C++, built using wxWidgets.") + (home-page "https://stable-diffusion.fsociety.hu") + (license license:expat) + )) (define-public bark-cpp (package |