Commit Graph
462 Commits
Author SHA1 Message Date
Julian Andrej f04fdefd1a rework enzyme inclusion 2022-06-14 11:55:27 -07:00
Tzanio Kolev 777e352a76 Merge branch 'master' into enzyme-nonlinear
Conflicts:
	makefile
2022-06-08 11:23:44 -07:00
Tzanio Kolev d3e94af7f1 Merge pull request #2952 from mfem/yohann/libCEED-refactor
Reorganize libCEED integration.
2022-06-02 09:49:38 -07:00
Will Pazner 716af52129 Merge pull request #2879 from mfem/talgoim
Support for the Algoim library [talgoim]
2022-05-31 11:15:51 -07:00
blaz 64da28ff89 cmake - remove MFEM_USE_BLITZ 2022-05-23 20:03:54 -07:00
Tzanio Kolev 6e82a1953b Merge branch 'master' into enzyme-nonlinear
Conflicts:
	tests/benchmarks/makefile
2022-05-18 14:05:21 -07:00
Yohann Dudouit 43ae57c3b3 Fix make install 2022-05-13 12:23:10 -07:00
Yohann Dudouit fb219d9e9f Merge branch 'master' into yohann/libCEED-refactor 2022-05-10 10:11:52 -07:00
blaz 8fe876fd45 Revert to Algoim 1 2022-05-05 12:27:34 -07:00
blaz c986685157 does not require algoim lib to be defined 2022-05-04 22:02:21 -07:00
blaz 45dcea96a9 Merge branch 'master' into talgoim 2022-05-04 17:11:16 -07:00
Will Pazner 73e5e6ed89 Merge remote-tracking branch 'origin/master' into lor-batched
# Conflicts:
#	makefile
2022-04-13 09:52:01 -07:00
Yohann Dudouit f8ce8fe5c0 Indent makefile 2022-04-11 11:02:46 -07:00
Patrick Zulian eaf510e5e3 Removed fem/moonolith/parallel folder and adjusted cmake/make files 2022-04-11 09:55:01 +02:00
Yohann Dudouit 5adc33c8a5 Reorganize libCEED integration. 2022-03-31 17:18:06 -07:00
Julian Andrej 9d06122995 Merge branch 'master' into enzyme-nonlinear 2022-03-30 09:19:55 -07:00
Will Pazner 9d060ef8a9 Merge remote-tracking branch 'origin/master' into lor-batched-gpu-no-mesh 2022-03-25 13:32:03 -07:00
Patrick Zulian 0b7faae94c fixed conflicts with master 2022-03-23 08:45:31 +01:00
Veselin Dobrev 3fe71947a9 Update version numbers to 4.4.1 -- a new development version 2022-03-22 14:10:00 -07:00
Julian Andrej 24824722f2 Merge branch 'master' into enzyme-nonlinear 2022-03-22 11:35:10 -07:00
Patrick Zulian ebbcdfee4f fixed conflicts with master branch 2022-03-22 09:01:16 +01:00
Will Pazner afc20ffca1 Merge remote-tracking branch 'origin/master' into lor-batched-gpu-no-mesh
# Conflicts:
#	doc/makefile
#	linalg/hypre.cpp
#	miniapps/solvers/plor_solvers.cpp
2022-03-21 20:53:45 -07:00
Veselin Dobrev ec9e8fb0b8 In 'make style', include headers in tests/unit, excluding the
Catch2 header.
2022-03-21 10:23:37 -07:00
Tzanio c39ba9381f More small adjustments before the release 2022-03-21 10:16:50 -07:00
blaz c5f8836fc7 Confifuration Algoim and Blitz 2022-03-09 22:44:34 -08:00
Tzanio 5393b1dc34 Version is 4.4 2022-03-07 18:54:33 -08:00
Will Pazner 1fb26145b1 Merge remote-tracking branch 'origin/master' into lor-batched-gpu-no-mesh
# Conflicts:
#	general/cuda.hpp
#	tests/unit/CMakeLists.txt
2022-03-01 17:54:15 -08:00
Will Pazner e46e84cae4 Batched LOR: cleanup 2022-02-28 16:52:35 -08:00
Tzanio 6d2530775b Extended copyright to 2022 2022-02-25 10:24:50 -08:00
Julian Andrej 4beda68a36 add enzyme to makefile build system 2022-02-11 08:04:36 -08:00
zulianp 28a9f5c8fc removed spurious newlines 2021-12-24 10:31:40 +01:00
zulianp cfc0936a7a Fixed conflicts with master 2021-12-03 19:39:37 +01:00
blaz 293acb99d9 small amendments 2021-11-24 17:32:44 -08:00
Tzanio e5e4a7e753 Merge branch 'master' into pr_autodiff 2021-11-14 12:08:07 -08:00
Tzanio 4cc03b4238 Small adjustments 2021-11-14 11:54:02 -08:00
Will Pazner acbe45ea91 Allow for customizing compiler flags for generating dependencies
On Mac, by default, add the flag -Wno-unused-command-line-argument
2021-11-10 14:34:52 -08:00
blaz 269eb6b7d1 fix in the makefile configuration 2021-11-02 17:51:24 -07:00
blaz eeb0ede002 Merge branch 'master' into pr_autodiff 2021-10-29 11:21:47 -07:00
Tzanio Kolev f66ddbc394 Merge pull request #2335 from mfem/fe-split-dev
Splitting fe.[ch]pp
2021-09-28 13:49:04 -07:00
camierjs b705c964d6 Merge branch 'master' into google-benchmark 2021-09-26 18:13:48 -07:00
Tzanio 6c56ad3d7a Merge branch 'master' into fe-split-dev 2021-09-26 18:05:36 -07:00
Tzanio Kolev a303bcdf0a Merge branch 'master' into pr_autodiff 2021-09-26 17:28:25 -07:00
Tzanio d5d7828285 Merge branch 'master' into parelag_miniapps 2021-09-16 08:27:13 -07:00
camierjs 5c02f574e7 Merge master in google-benchmark 2021-09-14 12:08:28 -07:00
Stowell, Mark L 3c0b0896e6 Merge remote-tracking branch 'origin/master' into fe-split-dev
# Conflicts:
#	fem/fe.cpp
#	fem/fe.hpp
2021-09-14 12:00:07 -07:00
Adrien M. Bernede 89fdb3c909 Bump astyle version 2021-09-03 12:13:56 -07:00
Kalchev, Delyan 67b6f6ecfb Merge conflicts resolved. 2021-08-31 17:58:19 -07:00
camierjs 83dcf7f4d0 Merge master in google-benchmark 2021-08-20 14:22:48 -07:00
Veselin Dobrev 88082dc136 Add caliper to the list of sub-directories under examples.
Apply 'make style'.
2021-08-18 16:40:25 -07:00
camierjs 5df0a0e2a1 Merge master in google-benchmark 2021-08-16 08:28:56 -07:00