Commit Graph

11239 Commits

Author SHA1 Message Date
Ruipeng Li
c4e6cdc080 for running regression tests with GPU setup/assembly 2020-03-04 17:25:13 -08:00
Ruipeng Li
3982a1e89a Merge branch 'amg-setup' of https://github.com/hypre-space/hypre into amg-setup 2020-03-04 00:01:08 -08:00
Ruipeng Li
4f8352e70c bug fix 2020-03-04 00:00:03 -08:00
Ruipeng Li
2e4c8145eb remove cub from check license filters 2020-02-28 15:22:28 -08:00
Ruipeng Li
b58c1f2f49 more bug fixes regarding CUB 2020-02-28 12:19:41 -08:00
Ruipeng Li
cf4d9b78b5 bug fix in ILU 2020-02-28 00:32:23 -08:00
Ruipeng Li
fbb7034001 Merge branch 'amg-setup' of https://github.com/hypre-space/hypre into amg-setup 2020-02-27 22:29:40 -08:00
Ruipeng Li
43ad3d6703 cub allocator 2020-02-27 22:28:44 -08:00
Ruipeng Li
5b1d72cb25 bug fix 2020-02-27 14:59:46 -08:00
Ruipeng Li
0f20a71d72 fix after pull in master 2020-02-27 14:41:19 -08:00
Ruipeng Li
f491d130f1 Merge branch 'master' of https://github.com/hypre-space/hypre into amg-setup
Conflicts:
	src/IJ_mv/HYPRE_IJ_mv.h
	src/parcsr_ls/HYPRE_parcsr_ls.h
	src/parcsr_ls/_hypre_parcsr_ls.h
	src/parcsr_ls/par_amg.h
	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_mgr.h
	src/parcsr_ls/par_mgr_setup.c
	src/parcsr_ls/par_mgr_solve.c
	src/parcsr_ls/par_strength.c
	src/parcsr_mv/par_csr_matrix.c
	src/test/ij.c
2020-02-27 14:41:09 -08:00
Quan Bui
4ffbb00dbf Fix indentation and minor clean up. 2020-02-27 12:33:52 -08:00
Quan Bui
84423747c1 New interface for setting Cpoints using a point marker array.
Updated test for compositional flow with wells.
2020-02-27 11:13:07 -08:00
Ruipeng Li
022d476eda bug fix 2020-02-26 14:24:29 -08:00
Ruipeng Li
22b18ab989 bug fix in ams 2020-02-25 23:44:05 -08:00
Ruipeng Li
c9b0f47a3a bug fix 2020-02-25 16:08:51 -08:00
Ruipeng Li
9ef162da5a HYPRE_Init in examples; cmake; ams 2020-02-25 15:38:03 -08:00
Ruipeng Li
9e83173a85 Merge branch 'amg-setup' of https://github.com/hypre-space/hypre into amg-setup 2020-02-24 22:17:36 -08:00
Ruipeng Li
1afd4a09a9 memory model, exec policy, etc 2020-02-24 22:16:18 -08:00
Daniel Osei-Kuffuor
eb71948edd Merge branch 'master' into mgr-dev 2020-02-24 09:49:18 -08:00
Rob Falgout
9e2e1491af
Merge pull request #80 from hypre-space/docs
Adding reference manual info to Sphinx documentation

This adds the reference manual to the Sphinx online user documentation. There is still some cleaning up that can be done in the future, but this is a good step forward. On the left of the online document, there is a new tab called 'API'. Click on that to browse the reference material.

Some comments:
- This uses a combination of sphinx, doxygen, and breathe. Basically, the header file stuff we used before with doc++ and more recently with doxygen is being imported into sphinx through an extension called breathe.
- The individual reference pages are still a bit long, but it's not clear how to shorten them without adding a bunch of extra files to the usr-manual directory. There are already more files than would be ideal. Maybe some new features in breathe will become available in the future.
- See the 'src/docs/README.md' file for information on writing documentation
2020-02-21 16:24:23 -08:00
Bjorn Sjogreen
4bfbba62a7 added par_lr_interp_device.c 2020-02-21 15:36:53 -08:00
Rob Falgout
f68cb7bdba Added copyright header to readthedocs.yml file 2020-02-21 14:04:54 -08:00
Rob Falgout
0b1f1f244c Fixed a few remaining issues in HYPRE_parcsr_ls.h 2020-02-21 14:02:24 -08:00
Rob Falgout
1e70d39cd5 Adding copyright header to docs/usr-manual/requirements.txt file 2020-02-21 13:33:29 -08:00
Rob Falgout
716ddf63d2 Updated ParCSR solver header file to conform to new documentation approach 2020-02-21 13:24:45 -08:00
Bjorn Sjogreen
96a23ae14d first version of extended interpolation on device 2020-02-21 11:57:03 -08:00
Rob Falgout
7665049836 Merge branch 'master' into docs 2020-02-21 10:56:39 -08:00
Rob Falgout
10a4cd53f8
Merge pull request #86 from hypre-space/lobpcg
Clean up header files related to LOBPCG
2020-02-21 10:08:45 -08:00
Rob Falgout
086c56e5d5 Merge branch 'master' into lobpcg 2020-02-21 07:46:11 -08:00
Daniel Osei-Kuffuor
3d6424fa54
Merge pull request #72 from hypre-space/mgr-dev
New hypre ILU solver implementation and several updates to MGR solver
2020-02-21 04:04:07 -08:00
Bjorn Sjogreen
f3b79f23f5 Merge branch 'amg-setup' of https://github.com/hypre-space/hypre into amg-setup 2020-02-20 16:57:59 -08:00
Daniel Osei-Kuffuor
1147d72e53 Added hypre_ILU solver info to user manual. 2020-02-20 13:49:05 -08:00
Daniel Osei-Kuffuor
68c064eac3 Minor change to fix compile warning and error 2020-02-19 01:35:32 -08:00
Daniel Osei-Kuffuor
33bb597acd Modified to remove clang warning and potential bug. 2020-02-19 00:55:19 -08:00
Daniel Osei-Kuffuor
aac486403e Merge branch 'master' into mgr-dev 2020-02-18 23:54:17 -08:00
Daniel Osei-Kuffuor
3d0cd5064f Some benign edits to revert some recent changes. 2020-02-18 16:14:12 -08:00
Ruipeng Li
0b0e66fae1 Merge branch 'gpu-assembly' of https://github.com/hypre-space/hypre into amg-setup
Conflicts:
	src/parcsr_ls/ams.c
	src/parcsr_mv/par_csr_matvec.c
2020-02-18 15:16:34 -08:00
Quan Bui
271d55ed71 First version of an interface to set Cpoints by a marker array. 2020-02-14 09:57:10 -08:00
victor@tux
e22ae7f6a7 Add driver for testing IJMatrix assembly 2020-02-10 15:39:29 -08:00
victor@tux
7253e38adf Add missing include guards 2020-02-10 15:37:52 -08:00
Ruipeng Li
687232e116 gpu regression test [clean regression tests on ray] 2020-02-09 11:31:51 -08:00
Ruipeng Li
79aa36fc7b bug fix 2020-02-08 22:53:42 -08:00
Ruipeng Li
9b9e44d839 bug fix 2020-02-08 20:36:39 -08:00
Ruipeng Li
93261e4365 bug fix 2020-02-08 15:45:49 -08:00
Ruipeng Li
c7b29020de
Merge pull request #91 from hypre-space/gpu-assembly
merge Gpu assembly into amg-setup
2020-02-07 16:29:12 -08:00
Ruipeng Li
79b5d7bc16 wrong configure pushed... 2020-02-07 16:19:53 -08:00
Ruipeng Li
fc9e301a97 Merge branch 'amg-setup' of https://github.com/hypre-space/hypre into gpu-assembly 2020-02-07 16:13:27 -08:00
Ruipeng Li
eaecaf1733 Merge branch 'amg-setup' of https://github.com/hypre-space/hypre into gpu-assembly
Conflicts:
	src/config/configure.in
	src/configure
	src/parcsr_ls/par_amg_setup.c
	src/test/ij.c
2020-02-07 16:11:11 -08:00
Ruipeng Li
d2e5108f3a cuda stream sync, prefetch stream, etc 2020-02-07 15:48:09 -08:00