Veselin Dobrev
c9d9d0f8ff
Various tweaks in the template + SIMD code. Make sure the SIMD
...
interinsics can be used when CUDA is enabled.
A few tweaks related to adios2 when building with GNU make.
2020-05-15 12:33:07 -07:00
Veselin Dobrev
a95474b1e5
Proposed updates for the 'x86' branch.
2020-05-03 01:19:08 -07:00
William F Godoy
9c379891bf
Resolving conflicts with latest master
2020-03-18 09:41:46 -04:00
Jakub Cerveny
a2cf6022ed
Merge branch 'master' into gecko-integration2-dev
2020-03-11 09:23:38 +01:00
Julian Andrej
cb9c073e50
Add gslib to cmake
2020-03-06 09:26:07 -08:00
Tzanio
fd598e8643
Final changes
2020-03-04 19:40:18 -08:00
Tzanio
58872c9e7b
Merge branch 'master' into okina-mmu
...
Conflicts:
fem/datacollection.cpp
tests/unit/CMakeLists.txt
2020-03-04 15:19:33 -08:00
Tzanio
ca55ef0217
The release number for mfem-4.1 is LLNL-CODE-806117
2020-03-02 17:18:46 -08:00
Julian Andrej
d6dd084cfc
replaced gzstream with modified zstr
2020-02-27 14:32:04 -08:00
Tzanio
2caa222edf
A number of changes to switch the code from LGPL-2.1 to BSD-3:
...
- Updated LICENSE, README, CHANGELOG and CONTRIBUTING.md
- Removed COPYRIGHT, added NOTICE
- Updated the headers in all source files, makefiles, etc.
2020-02-23 11:16:46 -08:00
Veselin Dobrev
616aae7319
Fix compilation warnings about redefining preprocessor macros
...
like 'MFEM_DEVICE', 'MFEM_HOST_DEVICE', etc.
In the CMake build system, set the source language to CUDA (when used)
inside the MFEM functions 'add_mfem_examples' and 'add_mfem_miniapp'.
This eliminates the need to explicitly set the language for each
example/miniapp.
In the CMake build system, ensure correct linking of all examples,
miniapps, and tests when MPI and CUDA are enabled.
When building MFEM with Umpire and CUDA/HIP, make sure Umpire is also
built with CUDA/HIP.
Small update in CHANGELOG.
2020-02-18 19:40:22 -08:00
Jakub Cerveny
b6927a2cc2
Removed Gecko from both makefile and CMake build systems.
2020-02-14 13:53:13 +01:00
camierjs
3535f57a67
Rename UMPIRE to Umpire
2020-01-15 11:18:00 -08:00
camierjs
78a3e0c6d2
Merge branch 'master' into okina-mmu
2020-01-15 11:09:20 -08:00
camierjs
6a61e78bf9
Merge branch 'master' into okina-mmu
2020-01-06 11:01:36 -08:00
Tzanio
4886cb45bd
Merge branch 'master' into yohann/okina-gpu-libceed
...
Conflicts:
CHANGELOG
CMakeLists.txt
makefile
2019-12-29 14:48:44 -08:00
Tzanio
a901601ba1
Merge branch 'master' into ginkgo-interface-dev
...
Conflicts:
CMakeLists.txt
linalg/linalg.hpp
makefile
2019-12-27 12:17:51 -08:00
Veselin Dobrev
dc5765cf14
Merge branch 'master' into yohann/okina-gpu-libceed
2019-12-19 13:45:32 -08:00
camierjs
47f2aa0de7
Merge branch 'master' into okina-mmu
2019-12-16 17:59:40 -08:00
Tzanio
ae4f5805ac
Merge branch 'master' into hiop-dev
2019-12-15 20:43:36 -08:00
Veselin Dobrev
e18916ec92
Make sure CMake build works with libceed. In the GNU make build
...
system, install libceed q-function headers.
Add a runtime check for q-function header location: install/source
directories.
2019-11-07 16:48:55 -08:00
camierjs
d0f98d1619
MFEM_UMPIRE_HOST & MFEM_UMPIRE_DEVICE names
2019-10-24 18:34:39 -07:00
Pratik Nayak
2bf1517453
Add Ginkgo library CMake detection and linking.
2019-10-21 17:28:39 +02:00
Vladimir Tomov
52c90d03cb
Merge branch 'master' into hiop-dev
...
Conflicts:
CMakeLists.txt
config/cmake/config.hpp.in
config/config.hpp.in
config/defaults.cmake
config/defaults.mk
makefile
2019-08-20 15:17:19 -07:00
camierjs
ec429a89fe
Merge branch 'master' into okina-mmu
2019-07-08 11:51:22 +02:00
artv3
20bc0cbfec
Merge branch 'axom-dev' into mfem4+axom
2019-05-25 08:56:25 -07:00
Tzanio
3d88be85bc
Removed MFEM_USE_MM -- it is no longer necessary
2019-05-21 19:18:50 -07:00
Kenneth Weiss
20becdcab0
Updates Axom TPL setup
2019-04-30 21:45:30 -07:00
Kenneth Weiss
690eb80767
Updates axom library names in build system
2019-04-30 20:50:44 -07:00
camierjs
34668ca4cd
UMPIRE addon
2019-04-29 09:10:58 -07:00
Veselin Dobrev
8a8d9419d1
Some small modifications in the build systems.
2019-04-19 20:51:16 -07:00
camierjs
16ca9883eb
Use CMake 3.8 CUDA native support to compile MFEM + examples
2019-04-17 16:15:26 -07:00
camierjs
21edf56417
First cmake MFEM_USE_CUDA/OCCA/RAJA pass
2019-04-16 18:54:01 -07:00
Johann Dahm
aceb2e43cb
Add MFEM_USE_OPENMP back in a few other necessary locations
2019-04-05 12:59:04 -07:00
Johann Dahm
a2614ad20f
MFEM_USE_OPENMP -> MFEM_USE_LEGACY_OPENMP
2019-04-04 20:26:38 -07:00
Johann Dahm
8409f6e819
Revert "Renamed the old OpenMP support option to MFEM_LEGACY_USE_OPENP, so"
...
This reverts commit 575f351419 .
2019-04-04 20:25:45 -07:00
Tzanio
575f351419
Renamed the old OpenMP support option to MFEM_LEGACY_USE_OPENP, so
...
MFEM_LEGACY_OPENMP can be used for OpenMP support in the Okina kernels.
2019-04-04 19:50:46 -07:00
Veselin Dobrev
3d0ffe65e4
Remove the 'shaper' miniapp from config/sample-runs.sh -- it
...
requires user input.
In the build systems, fix/update the value of MFEM_LIB_FILE exported
in the generated file config.mk.
2018-11-15 20:57:32 -08:00
Vladimir Tomov
2544806e9f
Merge branch 'master' into hiop-dev
2018-11-14 18:21:52 -08:00
Tzanio Kolev
c55788c526
Merge pull request #508 from cwsmith/cwsmith/cmake_create_config.mk
...
CMake creates config.mk and installs config.mk and test.mk [cwsmith/cmake_create_config.mk]
2018-11-05 09:36:51 -08:00
Veselin Dobrev
e8fc6fcdb2
In the CMake build system, use CMAKE_SHARED_LIBRARY_CXX_FLAGS to
...
get the PIC compiler flag instead of the hardcoded '-fPIC' value.
Suggested by: @cwsmith
2018-10-29 17:05:03 -07:00
Veselin Dobrev
3b69137064
Move the code for generating 'config.mk' from CMakeLists.txt to
...
a function in MfemCmakeUtilities.cmake, applying various tweaks.
Use the new cmake variable MFEM_MPI_NP when running the parallel
tests.
Remove the config variable MFEM_CPPFLAGS - it is not really used
anywhere. Also, remove the variables MFEM_MPIEXEC and
MFEM_MPIEXEC_NP since these values are autodetected by CMake.
Fix a warning in ex18.hpp.
In the makefile buidl system set MFEM_LIB_FILE to the versioned
shared library (when building shared) instead of the non-versioned
link.
2018-10-23 17:35:49 -07:00
Tzanio
fef3d1c3a3
Minor
2018-09-17 14:53:27 -07:00
Cosmin G. Petra
0b324b8130
serial driver works with hiop irrespective of whether mfem and hiop use MPI or not
2018-09-03 10:54:55 -07:00
Aaron Fisher
e269582dbe
Added optional xsdk variable aliases for all of the external libraries.
2018-08-28 15:43:24 -07:00
Cosmin G. Petra
0d31870445
updated the CMake build system for HIOP
...
works with HIOP_DIR specification in cmake command
provides correct include and lib paths within CMakeLists.txt
hiop interface implementation class compiles within MFEM
2018-07-30 15:48:23 -07:00
Tzanio
f97f175328
Minor
2018-02-26 14:58:35 -08:00
Tzanio
dddb244ac5
Some styling
2018-01-09 13:28:55 -08:00
Cyrus Harrison
506888177c
Merge branch 'master' into task/2017_12_conduit_support
2018-01-05 10:18:51 -08:00
Cyrus Harrison
f8f29e0cc1
build system changes to make conduit hdf5 support optional
2017-12-19 15:37:17 -08:00