Commit Graph

10773 Commits

Author SHA1 Message Date
Rob Falgout
97404be515 Updating CHANGELOG and release number/date for 2.18.0 2019-09-26 16:16:53 -07:00
Ruipeng Li
1d87ef6e81
Merge pull request #49 from hypre-space/amg-setup
Amg setup
2019-09-26 15:40:37 -07:00
Ruipeng Li
42fa2d4bd8 changed the license in the new files 2019-09-26 15:14:05 -07:00
Ruipeng Li
57806d2129 for gpu regression test 2019-09-26 12:15:50 -07:00
Ruipeng Li
c84d2595e8 changes after GPU regression tests 2019-09-26 11:06:29 -07:00
Ruipeng Li
1fc065fe24 header 2019-09-25 15:37:59 -07:00
Ruipeng Li
0af952509c Merge branch 'master' of https://github.com/hypre-space/hypre into amg-setup
Conflicts:
	src/CMakeLists.txt
	src/config/configure.in
	src/parcsr_ls/HYPRE_parcsr_ls.h
	src/parcsr_ls/_hypre_parcsr_ls.h
	src/parcsr_ls/aux_interp.c
	src/parcsr_ls/par_amg.c
	src/parcsr_ls/par_amg_setup.c
	src/parcsr_ls/par_coarsen.c
	src/parcsr_ls/par_cycle.c
	src/parcsr_ls/par_interp.c
	src/parcsr_ls/par_strength.c
	src/parcsr_mv/_hypre_parcsr_mv.h
	src/parcsr_mv/par_csr_assumed_part.c
	src/parcsr_mv/par_csr_communication.c
	src/parcsr_mv/par_csr_communication.h
	src/parcsr_mv/par_csr_matop.c
	src/parcsr_mv/par_csr_matrix.c
	src/parcsr_mv/par_csr_matrix.h
	src/seq_mv/csr_matrix.c
	src/seq_mv/seq_mv.h
	src/utilities/_hypre_utilities.h
	src/utilities/hypre_memory.h
	src/utilities/protos.h
2019-09-25 15:36:06 -07:00
Ruipeng Li
31da8889aa some minor changes on GPU interpolation 2019-09-25 10:05:07 -07:00
Ruipeng Li
a8cbf255ba
Merge pull request #46 from bavier/fixes-for-cray-compiler
Fixes for Cray compiler
2019-09-24 17:16:33 -07:00
Ruipeng Li
087ccfc054 Soc device and thrust 2019-09-24 11:57:58 -07:00
Ruipeng Li
e1132027b5 GPU amg setup 2019-09-20 13:41:31 -07:00
Ruipeng Li
38aa211979 passed GPU regression tests 2019-09-20 13:35:30 -07:00
Ruipeng Li
55cb0194b1 GCC warning:ISO C does not permit named variadic macros 2019-09-20 09:24:46 -07:00
Ruipeng Li
89470a5e26 GPU amg setup rap 2019-09-19 14:02:17 -07:00
Eric Bavier
1d3c8916e2 More macro stringification.
Cray's C compiler complains about malformed pragmas.  Indeed, without
stringification the OMP1 et al. macros expand to an invalid statement:

  _Pragma("omp parallel ... HYPRE_SMP_SCHEDULE")

Other compiler seem not to complain about this...
2019-09-13 14:51:20 -05:00
Eric Bavier
ed8b993010 utilities: Use more portable ffs() from strings.h.
Also remove conditional statement that was likely never be taken given
the uses of first_lsb_bit_indx and is otherwise equivalent to ffs(x)-1
when 0==x.
2019-09-13 14:35:23 -05:00
Bjorn Sjogreen
e1f4331a37 Inserted GPU functions for amg setup, user defined exec policy implemented 2019-09-12 17:40:13 -07:00
Bjorn Sjogreen
e48bb13837 added GPU version of direct interpolation 2019-09-04 16:50:40 -07:00
Bjorn Sjogreen
89993933dd added GPU support for direct interpolation 2019-09-04 16:40:39 -07:00
Bjorn Sjogreen
e0bf7b16b7 replaced quicksort by insertion sort on device 2019-09-03 14:20:02 -07:00
Sarah Virginia Osborn
fc4c2ff377 Remove cmake linking with MPI_CXX libraries.
This should fix the cmake tests.
2019-08-27 17:10:41 -07:00
Rob Falgout
ea6baeced8 Added RecomputeResidual options to struct and ij drivers 2019-08-20 15:30:47 -07:00
Rob Falgout
03bbd1d6d2 Added RecomputeResidual options to the hybrid solvers
Also added some code to 'sstruct.c' to check the GetBoxValues() routine and
final relative residual norms computed in the various solvers.  That code is
commented out by default with '#if 0'.  Need to decide if recomputing the
residual should be the default.
2019-08-20 14:29:34 -07:00
Sarah Osborn
9e68a1e838
Merge pull request #40 from hypre-space/autotest-cmake-updates-dev
Autotest changes for updated cmake
2019-08-20 11:44:09 -07:00
Sarah Virginia Osborn
06c43e4ce3 Fixes to cmake autotests with updated test build. 2019-08-20 11:20:30 -07:00
Sarah Virginia Osborn
80b78ed98b Remove test/cmbuild directory (no longer need to cmake build). 2019-08-20 11:19:45 -07:00
Sarah Osborn
7a2a476317
Merge pull request #36 from hypre-space/cmake-updates-dev
Cmake updates dev
2019-08-19 11:23:46 -07:00
Sarah Virginia Osborn
a16e7b3576 Unify WITH vs ENABLE configure variable names. 2019-08-16 17:40:03 -07:00
Sarah Virginia Osborn
d7ce979f4e Re-org change to move cmake/ to config/. 2019-08-15 09:32:41 -07:00
Sarah Virginia Osborn
1da9b8009d Each subdirectory now contains its own cmake list. 2019-08-15 09:20:19 -07:00
Sarah Virginia Osborn
042c662a30 Add missing license headers. 2019-08-12 18:08:46 -07:00
Sarah Virginia Osborn
bf5ccf497d Set cmake policy to allow using *_ROOT to set prefixes. 2019-08-12 18:01:46 -07:00
Sarah Virginia Osborn
2c0a996ee7 Add warning about FEI and revert that cmakelist back to original. 2019-08-08 13:13:14 -07:00
Sarah Virginia Osborn
4fc6292509 Add the various cmake updates. 2019-08-08 09:53:01 -07:00
Sarah Virginia Osborn
692632d9b0 Finish HAVE_DSUPERLU -> HYPRE_USING_DSUPERLU (but leave HAVE_SUPERLU unchanged). 2019-08-08 09:49:16 -07:00
Sarah Virginia Osborn
a1e60ad473 Remove accidental changes to Makefiles. 2019-08-07 15:16:04 -07:00
Sarah Virginia Osborn
3f55c1876d Merge branch 'master' into cmake-updates-dev
Conflicts:
	src/CMakeLists.txt
	src/parcsr_ls/HYPRE_parcsr_pcg.c
	src/parcsr_ls/par_amg_setup.c
	src/test/CMakeLists.txt
2019-08-07 13:48:56 -07:00
Ruipeng Li
32eaa9635c
Merge pull request #32 from hypre-space/AIR
Air
2019-08-06 07:59:25 -07:00
Ruipeng Li
7dc306b5d3 Merge branch 'master' of https://github.com/hypre-space/hypre into AIR 2019-08-06 07:55:58 -07:00
Ruipeng Li
420721be29 Merge branch 'master' of https://github.com/hypre-space/hypre 2019-08-06 07:53:19 -07:00
Ruipeng Li
2563b3bd93
Merge pull request #35 from hypre-space/RL-fixes
Rl fixes
2019-08-06 07:51:35 -07:00
Ruipeng Li
2b6e451851 Merge branch 'master' of https://github.com/hypre-space/hypre into RL-fixes
Conflicts:
	src/parcsr_ls/ams.c
2019-08-06 07:49:45 -07:00
Ruipeng Li
2928f09f55 Merge branch 'master' of https://github.com/hypre-space/hypre
Conflicts:
	src/parcsr_ls/ams.c
2019-08-06 07:44:29 -07:00
Ulrike Yang
d31cc83393 fixed memory leak. 2019-08-03 13:14:52 -07:00
Ruipeng Li
c77f8788e2 memory leak fix 2019-08-02 16:47:52 -07:00
Ruipeng Li
dc92bd67d5 Merge branch 'master' of https://github.com/hypre-space/hypre 2019-08-02 14:28:36 -07:00
Ruipeng Li
3dbff29807 Merge branch 'master' of https://github.com/hypre-space/hypre into AIR 2019-08-02 11:37:18 -07:00
Ruipeng Li
b189855fd9 some more fixes on AIR 2019-08-02 11:32:08 -07:00
Ruipeng Li
d83560bb6d changes after reviews 2019-08-02 10:57:55 -07:00
Ruipeng Li
e9cba48ba2
Merge pull request #34 from hypre-space/fix-ams-stuff
added various changes to fix segfault in AMSFEISetup,
2019-08-02 12:20:48 -04:00