diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 9f2eed7b93a..b21f9fd875f 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -5069,7 +5069,7 @@ PyTorch.") googlebenchmark libuv miniz-for-pytorch - oneapi-dnnl + onednn openblas openmpi openssl ; for cpp-httplib @@ -5196,7 +5196,7 @@ test/torchaudio_unittest/prototype/hifi_gan/hifi_gan_gpu_test.py" (native-inputs (list cmake ninja - oneapi-dnnl + onednn python-expecttest python-parameterized python-pytest @@ -6727,67 +6727,6 @@ easily extensible.") Brian 2 simulator.") (license license:cecill))) -(define-public oneapi-dnnl - (package - (name "oneapi-dnnl") - (version "3.5.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/oneapi-src/oneDNN") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1m2d7qlbfk86rmvmpvx2k3rc2k0l9hf9qpa54jl44670ls9n8i7w")) - (modules '((guix build utils) - (ice-9 rdelim))) - ;; Copyright date used by code generation script - (snippet - '(for-each - (lambda (file) - (with-atomic-file-replacement - file - (lambda (in out) - (let loop ((line (read-line in 'concat))) - (if (string-contains line "Copyright") - (display line out) - (loop (read-line in 'concat))))))) - '("include/oneapi/dnnl/dnnl_debug.h" - "src/common/dnnl_debug_autogenerated.cpp" - "tests/benchdnn/dnnl_debug_autogenerated.cpp" - "tests/benchdnn/dnnl_debug.hpp"))))) - (build-system cmake-build-system) - (arguments - (list - #:configure-flags - `(list - ,@(if (target-riscv64?) - (list #:configure-flags '("-DDNNL_CPU_RUNTIME=SEQ")) - '()) - ;; Used in PyTorch - "-DDNNL_EXPERIMENTAL_UKERNEL=ON") - #:phases - '(modify-phases %standard-phases - (add-after 'configure 'codegen - (lambda _ - (with-directory-excursion "../source" - (invoke "castxml" "--castxml-cc-gnu-c" "clang" - "--castxml-output=1" "-DDNNL_EXPERIMENTAL_SPARSE" - "-Iinclude" "-I../build/include" - "include/oneapi/dnnl/dnnl_types.h" "-o" "types.xml") - (invoke "python3" "scripts/generate_dnnl_debug.py" "types.xml") - ;; Modifies include/oneapi/dnnl/dnnl.hpp - (invoke "python3" "scripts/generate_format_tags.py"))))))) - (native-inputs (list castxml clang-17 python)) - (home-page "https://github.com/oneapi-src/oneDNN") - (synopsis "Deep Neural Network Library") - (description - "OneAPI Deep Neural Network Library (oneDNN) is a cross-platform -performance library of basic building blocks for deep learning applications.") - (supported-systems %64bit-supported-systems) - (license license:asl2.0))) - (define-public python-gguf (package (name "python-gguf") diff --git a/gnu/packages/oneapi.scm b/gnu/packages/oneapi.scm index 7252b33e42d..2e49c291335 100644 --- a/gnu/packages/oneapi.scm +++ b/gnu/packages/oneapi.scm @@ -149,6 +149,8 @@ performance library of basic building blocks for deep learning applications.") (supported-systems %64bit-supported-systems) (license license:asl2.0))) +(define-public oneapi-dnnl (deprecated-package "oneapi-dnnl" onednn)) + ;;; Updates and replaces tbb in (gnu packages tbb) (define-public onetbb (package