Rob Falgout
21a12a8e7b
Fixed a compile warning
2018-03-16 13:47:57 -07:00
Ruipeng Li
50e7a94b21
Merge branch 'master' of ssh://mybitbucket.llnl.gov:7999/hypre/hypre
2018-03-16 13:26:26 -07:00
Ruipeng Li
9e07cb76c8
fixed problems with --with-cuda and --with-openmp. removed configure option --with-nvcc
2018-03-16 13:25:33 -07:00
Rob Falgout
7ec11bb78e
Fixed some compiler warnings.
2018-03-16 09:44:25 -07:00
Rob Falgout
0f897b2931
Moved one of the AMG function prototypes to a different location
2018-03-15 16:15:20 -07:00
Falgout, Rob
d2843497ff
Merge pull request #13 in HYPRE/hypre from new-gpu-dev to master
...
Merging new GPU branch code for release 2.14.0
* commit '945ba797884d5ac3dc6425376bd33fc914cfb52c': (149 commits)
rename configure option to --with-device-openmp
Updating release date info for 2.14.0
Updated some Alloc/Free calls that were missed.
Removing utilities/memsizes.C
Updating CHANGELOG for release 2.14.0
fixed a race condition, missing private variables
Fixed a compile warning in boxloop.h
Passed ./runtest.sh -D HYPRE_NO_SAVED -nthreads 2 TEST_struct/sstruct/ij/ams
redid hypre_memory.c.h
bug fixes
bug fixes
[work in progress] redo hypre_memory.c.h
code cleanup
change default opt to -O2
Downgraded an error message to a warning in par_amg_setup. Fixed a possible issue in IsManaged.
Added dummy ASSERT_MANAGED and ASSERT_HOST to make the code compile
more fixes for AUTOTEST
more fixes for gpu release
configure and bug fixes
bug fix without using cudamemset with omp45
...
2018-03-15 16:04:18 -07:00
Ruipeng Li
8100c61ee2
some docs for AIR
2018-03-15 14:24:11 -07:00
Ruipeng Li
945ba79788
rename configure option to --with-device-openmp
2018-03-15 13:23:47 -07:00
Rob Falgout
5283a2671c
Updating release date info for 2.14.0
2018-03-15 12:48:14 -07:00
Rob Falgout
798b01233c
Updated some Alloc/Free calls that were missed.
2018-03-15 12:39:24 -07:00
Rob Falgout
e3b6ee5d2f
Removing utilities/memsizes.C
2018-03-15 10:59:38 -07:00
Rob Falgout
91485a9352
Merge branch 'new-gpu-dev' of ssh://mystash.llnl.gov:7999/hypre/hypre into new-gpu-dev
2018-03-15 10:51:01 -07:00
Rob Falgout
8126bd784e
Updating CHANGELOG for release 2.14.0
2018-03-15 10:50:25 -07:00
Ulrike Yang
536f544fdf
fixed a race condition, missing private variables
2018-03-15 09:31:10 -07:00
Rob Falgout
77bc2012c4
Fixed a compile warning in boxloop.h
2018-03-15 08:53:34 -07:00
Ruipeng Li
0b84bee0da
Passed ./runtest.sh -D HYPRE_NO_SAVED -nthreads 2 TEST_struct/sstruct/ij/ams
2018-03-14 20:14:43 -07:00
Ruipeng Li
b7511990aa
Merge branch 'master' of https://mybitbucket.llnl.gov/scm/hypre/hypre into new-gpu-dev
2018-03-14 13:44:43 -07:00
Rob Falgout
4faa8daf94
Changed machine-tux autotest script to run with openmp (not just compile)
2018-03-14 11:54:48 -07:00
Ruipeng Li
0936ce00a9
Merge branch 'new-gpu-dev' of ssh://mystash.llnl.gov:7999/hypre/hypre into new-gpu-dev
2018-03-06 17:09:01 -08:00
Ruipeng Li
1c67cbce4f
redid hypre_memory.c.h
2018-03-06 17:07:43 -08:00
Ruipeng Li
af600072aa
bug fixes
2018-03-05 23:44:59 -08:00
Ruipeng Li
0b46d34a64
bug fixes
2018-03-05 18:00:14 -08:00
Ruipeng Li
aa779919ed
[work in progress] redo hypre_memory.c.h
2018-03-05 15:44:45 -08:00
Ruipeng Li
c539f86e12
code cleanup
2018-03-02 22:24:43 -08:00
Ruipeng Li
26402d930e
change default opt to -O2
2018-03-02 13:56:38 -08:00
Ramesh Pankajakshan
93be7cd362
Downgraded an error message to a warning in par_amg_setup. Fixed a possible issue in IsManaged.
2018-03-02 12:12:46 -08:00
Ramesh Pankajakshan
d38972534e
Added dummy ASSERT_MANAGED and ASSERT_HOST to make the code compile
2018-03-02 10:59:33 -08:00
Ruipeng Li
aaa26fd5a4
more fixes for AUTOTEST
2018-03-01 21:41:44 -08:00
Ruipeng Li
298d254060
Merge branch 'master' of ssh://mystash.llnl.gov:7999/hypre/hypre into new-gpu-dev
...
Conflicts:
src/parcsr_ls/aux_interp.c
src/parcsr_ls/par_amg_setup.c
src/parcsr_mv/par_csr_matrix.c
src/sstruct_ls/node_relax.c
2018-03-01 19:35:24 -08:00
Ruipeng Li
46d3981175
more fixes for gpu release
2018-03-01 18:03:02 -08:00
Ruipeng Li
cc40708b65
configure and bug fixes
2018-03-01 14:53:35 -08:00
Ruipeng Li
05a23f59ee
bug fix without using cudamemset with omp45
2018-02-27 18:58:33 -08:00
Ruipeng Li
91153c3308
fixed minor issues for regression tests
2018-02-25 10:18:38 -08:00
Ruipeng Li
620dda827d
Merge branch 'master' of ssh://mystash.llnl.gov:7999/hypre/hypre into AIR
2018-02-24 16:08:33 -08:00
Ruipeng Li
5013d34bce
new function ParCSRMarix C = alpha * A + beta * B
2018-02-23 18:39:22 -08:00
Ramesh Pankajakshan
824d8e0bb2
Merge branch 'new-gpu-dev' of ssh://mybitbucket.llnl.gov:7999/hypre/hypre into new-gpu-dev
...
Fixed the memory leak again.
Conflicts:
src/utilities/hypre_memory.c
2018-02-23 14:32:17 -08:00
Ramesh Pankajakshan
32fe2ed3ae
Added hypre_memory.c back
2018-02-23 13:59:13 -08:00
Ramesh Pankajakshan
ab3d195a9d
No change except for a commented out test
2018-02-23 13:57:59 -08:00
Lu WANG
9da5ff025f
fix the compiling warnings
2018-02-23 13:30:45 -08:00
Lu WANG
09f0399e7b
Fix the commit problem and add hypre_memory.c back
2018-02-23 13:19:14 -08:00
Ramesh Pankajakshan
80c5c9f9ca
Merge branch 'new-gpu-dev' of ssh://mybitbucket.llnl.gov:7999/hypre/hypre into new-gpu-dev
2018-02-23 12:07:04 -08:00
Lu Wang
5989b46382
Merge branch 'new-gpu-dev' of ssh://mybitbucket.llnl.gov:7999/hypre/hypre into new-gpu-dev
...
Conflicts:
src/utilities/hypre_memory.c
2018-02-23 11:29:58 -08:00
Lu Wang
ca60472dd9
fix some issue for hybrid model with const coeff
2018-02-23 11:29:04 -08:00
Ramesh Pankajakshan
3256ce289e
Changes to pass tests with the OMP3+CUDA version. Still fails some MGR tests: solvers.206,210 & 211
2018-02-23 11:20:19 -08:00
Ruipeng Li
b03a1347ac
Merge branch 'new-gpu-dev' of ssh://mystash.llnl.gov:7999/hypre/hypre into new-gpu-dev
2018-02-23 10:13:42 -08:00
Ruipeng Li
2ca84df13c
Merge branch 'new-gpu-dev' of ssh://mystash.llnl.gov:7999/hypre/hypre into new-gpu-dev
...
Conflicts:
src/utilities/Makefile
src/utilities/memsizes.C
2018-02-23 10:13:01 -08:00
Ramesh Pankajakshan
8edbee2a98
Fixed memory leak in ReAlloc. Cleaned up debug statements. Runs all tests using OMP4.5.
2018-02-23 09:19:56 -08:00
Ruipeng Li
ba6f7319b4
bug fix for air
2018-02-22 17:57:29 -08:00
Ruipeng Li
c1a10d3adf
minor changes
2018-02-22 17:44:14 -08:00
Ramesh Pankajakshan
ce39e8f0b5
Fixed a bug in ReAlloc.
2018-02-22 17:27:06 -08:00