Falgout, Rob
b455ad0158
Merge pull request #5 in HYPRE/hypre from cuda-um-dev to master
...
* commit 'd6a2ca36239381dca1bfaf3d6ce0f59abda59736': (57 commits)
Updated CHANGELOG and release info for release 2.12.0
fix the bug when dim = 1 for cuda, raja, and kokkos
Fixed a few check-int and check-double errors by filtering
Fixed incorrect use of HYPRE_USE_MANAGED in a few places
fix the bugs with --enable-unified-memory
Changed += to = in two places in test/Makefile
Didn't quite get the previous commit right
Fixed a minor timing header file mistake
add the missing flags for kokkos
add flags for xlC and mpixlC
fix the bug for initializing HYPRE_Int with real
Adding configure file
Updated a few compiler choices
change one line in configure.in to fix kokkos link issue
change the Makefile to a general way
Removing PHONY from the makefiles
fix some bugs in configure
reorganize the configure files and fix some bugs
Fixed a couple of UMTFree() issues
Workaround for handling managed memory allocated using hypre_UMAlloc but freed using hypre_TFree. Fixed the cudaError reset issue that Peng found.
...
2017-05-02 18:56:21 -07:00
Rob Falgout
d6a2ca3623
Updated CHANGELOG and release info for release 2.12.0
2017-05-02 16:22:34 -07:00
Lu Wang
0ead8deb96
fix the bug when dim = 1 for cuda, raja, and kokkos
2017-05-02 16:04:48 -07:00
Rob Falgout
cae7bc8dfb
Merge branch 'cuda-um-dev' of ssh://mystash.llnl.gov:7999/hypre/hypre into cuda-um-dev
2017-05-02 13:29:02 -07:00
Rob Falgout
ae65f5226f
Fixed a few check-int and check-double errors by filtering
2017-05-02 13:28:27 -07:00
Rob Falgout
4d6b4ec98c
Fixed incorrect use of HYPRE_USE_MANAGED in a few places
2017-05-02 13:19:38 -07:00
Lu Wang
361d1e0323
Merge branch 'cuda-um-dev' of https://mystash.llnl.gov/scm/hypre/hypre into cuda-um-dev
2017-05-02 10:29:37 -07:00
Lu Wang
5eef1bfe21
fix the bugs with --enable-unified-memory
2017-05-02 10:28:50 -07:00
Rob Falgout
5042edff41
Changed += to = in two places in test/Makefile
2017-05-02 09:17:54 -07:00
Rob Falgout
66fda7e6da
Didn't quite get the previous commit right
2017-05-02 08:36:15 -07:00
Rob Falgout
683f3e1dc4
Fixed a minor timing header file mistake
2017-05-02 08:33:58 -07:00
Lu Wang
8259486359
add the missing flags for kokkos
2017-05-01 18:37:04 -07:00
Lu Wang
754762e2c8
add flags for xlC and mpixlC
2017-05-01 18:32:28 -07:00
Lu WANG
6c197fc245
fix the bug for initializing HYPRE_Int with real
2017-05-01 17:52:50 -07:00
Rob Falgout
5127275df6
Adding configure file
2017-05-01 15:39:21 -07:00
Rob Falgout
edec4a1c04
Updated a few compiler choices
2017-05-01 15:38:26 -07:00
Lu Wang
0ffa2d77b3
change one line in configure.in to fix kokkos link issue
2017-05-01 14:07:27 -07:00
Lu Wang
c28f67467b
change the Makefile to a general way
2017-05-01 13:53:16 -07:00
Rob Falgout
fb6345fbc7
Removing PHONY from the makefiles
2017-05-01 11:15:28 -07:00
Lu Wang
0387792189
fix some bugs in configure
2017-04-29 23:53:04 -07:00
Lu Wang
27e3a41bd7
reorganize the configure files and fix some bugs
2017-04-29 17:26:56 -07:00
Rob Falgout
81c56bd8d8
Fixed a couple of UMTFree() issues
2017-04-28 17:43:45 -07:00
Ramesh Pankajakshan
33605854c1
Workaround for handling managed memory allocated using hypre_UMAlloc but freed using hypre_TFree. Fixed the cudaError reset issue that Peng found.
2017-04-28 16:09:40 -07:00
Rob Falgout
7bb61fc957
Fixed one remaining memory leak. Tux regression tests are all clean.
2017-04-28 08:28:10 -07:00
Rob Falgout
354c374c00
Cosmetic changes
2017-04-27 18:40:56 -07:00
Rob Falgout
c641b94581
Fixed a compile problem that showed up in the CMake tests
2017-04-27 17:52:52 -07:00
Rob Falgout
ba4094d3cb
Fixed a bug in FAC
2017-04-27 17:31:19 -07:00
Rob Falgout
72d4432e56
Cleaned up use of 'int', 'double', etc.
2017-04-27 15:57:21 -07:00
Rob Falgout
aeff44f431
Fixed a few more regression test errors
2017-04-27 14:27:06 -07:00
Rob Falgout
e6da2d8274
Fixed OpenMP stuff and utilities header file
2017-04-27 12:49:15 -07:00
Rob Falgout
0d5d3f41fa
Reworked struct_communication.c buffer copies.
...
This runs the regression tests cleanly through valgrind, but OpenMP doesn't
appear to be working at the moment. Will look into that next.
2017-04-26 19:30:57 -07:00
Rob Falgout
bd39dd61fb
Code compiles cleanly with default debug configure
2017-04-25 18:10:28 -07:00
Rob Falgout
f6466b956c
Merge branch 'master' into cuda-um-dev
2017-04-25 08:58:52 -07:00
Lu Wang
21d3f18183
merge gpu-dev branch
2017-04-24 14:18:47 -07:00
Rob Falgout
6f929d75ee
Added hypre_RandI prototype and updated two runtest save files
2017-04-18 08:12:20 -07:00
Daniel Osei-Kuffuor
109a2e7491
Modifications to use hypre's random.c routines instead of C routine rand().
2017-04-18 02:24:04 -07:00
Ramesh Pankajakshan
e97fd06503
Fixed some non-GPU compile issues
2017-04-12 14:23:13 -07:00
Ramesh Pankajakshan
632c16ef81
Added option GPU memory high water mark option(off by default). Changes to allow usie of managed memory without any GPU calls.
2017-04-12 12:28:00 -07:00
Ramesh Pankajakshan
1f641a37ef
Fixed host-only allocation names. Added host side malloc and Realloc.
2017-04-11 15:47:29 -07:00
Ramesh Pankajakshan
ddeb322551
Modifications to make the --wth-nvcc configure flag work on Ray.
2017-04-10 20:03:02 -07:00
Rob Falgout
fbb49ea213
Minor cosmetic changes and removed CPP stuff from utilities
2017-04-05 18:45:50 -07:00
Rob Falgout
a81828f257
Put GPU header files into _hypre_utilities.h and made other cosmetic changes
...
This has not been tested with nvcc. Also, some of the routines in gpukernels.cu
are needed in utilities, so maybe this file needs to be split or relocated to
utilities. The utilities files should not include from other directories in
hypre and relative includes (i.e., '../directory') are to be avoided.
2017-04-05 18:30:46 -07:00
Rob Falgout
1c62530f1d
Changed _hypre_utilities.h to auto generate and changed some nvcc configure stuff
...
The nvcc changes will need to change again once the other GPU work is merged.
The new 'Makefile.nvcc' and 'Makefile.empty' were used for portability, since
'if/else' is not standard in make. The only other time we have excluded files
from being compiled in hypre, we excluded entire directories, but the mechanism
was similar. This may need to be tweaked a bit.
The _hypre_utilities.h file is now generated with the 'headers' script and
should not be modified directly.
2017-04-05 16:43:23 -07:00
Ulrike Yang
5aa75df546
Merge branch 'master' of ssh://mystash.llnl.gov:7999/hypre/hypre
2017-04-05 16:13:22 -07:00
Ulrike Yang
e071c436cd
fixed memory leak
2017-04-05 16:12:11 -07:00
Ramesh Pankajakshan
e7217e11ba
Merge branch 'master' into cuda-um-dev, to prepare for the release
2017-03-31 10:13:24 -07:00
Ramesh Pankajakshan
f1c07263ac
Fixed some issues with the check for managed memory vectors and matrices. The check now emits an error message but does not exit.
2017-03-31 09:53:05 -07:00
Ramesh Pankajakshan
f057c48e4d
Remobed some C99isms, added device property check and functions to verify that ParVectors and matrices are managed.
2017-03-28 15:50:30 -07:00
Ramesh Pankajakshan
968de50558
Replaced ints with hypre_ints. Changed flags for nvcc in Makefile.config.in to include mpi include path(hardired for now)
2017-03-27 16:07:36 -07:00
Ramesh Pankajakshan
6a54a8f1d5
Replaced getstream with HYPRE_STREAM macro. hypre_GPUInit now takes an argument that is the device id
...
being used by the application.
2017-03-27 15:06:58 -07:00
