me
/
guix
Archived
1
0
Fork 0
Code

gnu: fenics: Do not alter PYTHONPATH. 

* gnu/packages/simulation.scm (fenics)[phases]: Delete trailing #t.
[phases]{pre-check}: Do not alter PYTHONPATH.
master
Maxim Cournoyer 2021-01-23 23:05:21 -05:00
parent c868f3a8f5
commit 1ebb629c14
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/simulation.scm
View File

@ -401,7 +401,8 @@ FIAT is part of the FEniCS Project.")
;; prior to running the tests. ;; prior to running the tests.
(invoke "py.test" "unit/" "--ignore=unit/ufc/") (invoke "py.test" "unit/" "--ignore=unit/ufc/")
(with-directory-excursion "uflacs" (with-directory-excursion "uflacs"
(invoke "py.test" "unit/")))))))) (invoke "py.test" "unit/")))
#t)))))
(home-page "https://bitbucket.org/fenics-project/ffc/") (home-page "https://bitbucket.org/fenics-project/ffc/")
(synopsis "Compiler for finite element variational forms") (synopsis "Compiler for finite element variational forms")
(description "The FEniCS Form Compiler (FFC) is a compiler for (description "The FEniCS Form Compiler (FFC) is a compiler for
@ -616,8 +617,7 @@ user interface to the FEniCS core components and external libraries.")
;; Define paths to store locations. ;; Define paths to store locations.
(setenv "PYBIND11_DIR" (assoc-ref %build-inputs "pybind11")) (setenv "PYBIND11_DIR" (assoc-ref %build-inputs "pybind11"))
;; Move to python sub-directory. ;; Move to python sub-directory.
(chdir "python") (chdir "python")))
#t))
(add-after 'build 'mpi-setup (add-after 'build 'mpi-setup
,%openmpi-setup) ,%openmpi-setup)
(add-before 'check 'pre-check (add-before 'check 'pre-check
@ -659,14 +659,8 @@ user interface to the FEniCS core components and external libraries.")
"d for d in demos if d[0].stem not in " "d for d in demos if d[0].stem not in "
"excludeList]\n"))) "excludeList]\n")))
(setenv "HOME" (getcwd)) (setenv "HOME" (getcwd))
(setenv "PYTHONPATH"
(string-append
(getcwd) "/build/lib.linux-x86_64-"
,(version-major+minor (package-version python)) ":"
(getenv "PYTHONPATH")))
;; Restrict OpenBLAS to MPI-only in preference to MPI+OpenMP. ;; Restrict OpenBLAS to MPI-only in preference to MPI+OpenMP.
(setenv "OPENBLAS_NUM_THREADS" "1") (setenv "OPENBLAS_NUM_THREADS" "1")))
#t))
(replace 'check (replace 'check
(lambda _ (lambda _
(with-directory-excursion "test" (with-directory-excursion "test"
@ -678,8 +672,7 @@ user interface to the FEniCS core components and external libraries.")
(min 3 (parallel-job-count))) (min 3 (parallel-job-count)))
"python" "-B" "-m" "python" "-B" "-m"
"pytest" "unit" "--ignore" "pytest" "unit" "--ignore"
"unit/nls/test_PETScSNES_solver.py")) "unit/nls/test_PETScSNES_solver.py"))))
#t))
(add-after 'install 'install-demo-files (add-after 'install 'install-demo-files
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((demos (string-append (let* ((demos (string-append
@ -693,8 +686,7 @@ user interface to the FEniCS core components and external libraries.")
(unless (equal? "." dir) (unless (equal? "." dir)
(mkdir-p tgt-dir) (mkdir-p tgt-dir)
(install-file file tgt-dir)))) (install-file file tgt-dir))))
(find-files "." ".*\\.(py|gz|xdmf)$")))) (find-files "." ".*\\.(py|gz|xdmf)$")))))))))
#t)))))
(home-page "https://fenicsproject.org/") (home-page "https://fenicsproject.org/")
(synopsis "High-level environment for solving differential equations") (synopsis "High-level environment for solving differential equations")
(description (description