Commit Graph

11546 Commits

Author SHA1 Message Date
Ruipeng Li
9b5f2730cd changed some assertions; offset in matvec 2020-08-05 16:32:23 -07:00
Ruipeng Li
6906e8e0f0 Merge branch 'master' of https://github.com/hypre-space/hypre into PETScFix 2020-08-05 15:04:10 -07:00
Ruipeng Li
efa4c2c854 minor changes, white spaces, comments, etc 2020-08-05 14:53:36 -07:00
Ruipeng Li
dfa31b5e07
Merge pull request #157 from pbauman/gpu-fixes
A few GPU-specific fixes/updates
2020-08-05 09:19:50 -07:00
Ruipeng Li
cea946c512 CXXFLAGS 2020-07-31 13:39:12 -07:00
Quan Bui
ba717c7ee4 Update example test. 2020-07-30 14:35:59 -07:00
ulrikeyang
13e2cad483
Merge pull request #165 from hypre-space/fix-mixed-int
fixed some mixed-int issues.
2020-07-30 09:27:17 -07:00
liruipeng
e98ac77774 fixed a mixed-int in GPU code 2020-07-30 09:20:53 -07:00
Ruipeng Li
d8f683d11c
Merge pull request #141 from hypre-space/gpu_doc
GPU build doc
2020-07-30 09:04:22 -07:00
Quan Bui
4431a4acd7 Minor clean up. 2020-07-30 06:39:30 -07:00
Quan Bui
079e99515f First implementation of direct solver option for coarse grid solve in MGR. 2020-07-30 06:21:26 -07:00
Ulrike Yang
b5d162e808 fixed some mixed-int issues. 2020-07-29 19:55:12 -07:00
Rob Falgout
6846fc28da Added a comment associated with previous --enable-mixedint commit 2020-07-27 15:59:40 -07:00
Rob Falgout
3ff4454aae Fixing a problem with --enable-mixedint on a Mac 2020-07-27 15:53:13 -07:00
Ruipeng Li
d20cef846b fixed compile flag issue for gpu 2020-07-24 17:49:17 -07:00
Ruipeng Li
2370d7d688 Merge branch 'master' of https://github.com/hypre-space/hypre into PETScFix 2020-07-24 17:33:57 -07:00
Ruipeng Li
ffeed7229c fix cusparse matvec for ncol==0 2020-07-24 17:23:11 -07:00
Paul T. Bauman
26a1a8a972 result_type needed by clang
Without this, this function doesn't compile with clang.
2020-07-23 08:56:20 -05:00
Paul T. Bauman
a5594908ff Parentheses for better readability 2020-07-23 08:56:20 -05:00
Paul T. Bauman
2e5ccb684e Critical portability fix in warp_prefix_sum
The precedence in the operator behavior in "<<" and "-" is different
between nvcc and clang. In clang, we were getting warnings
(see e.g. https://cuda.godbolt.org/)

warning: operator '<<' has lower precedence than '-'; '-' will be evaluated first [-Wshift-op-parentheses]

    *result = (lane_id & (d << 1 - 1)) == (d << 1 - 1);

                            ~~ ~~^~~

note: place parentheses around the '-' expression to silence this warning

    *result = (lane_id & (d << 1 - 1)) == (d << 1 - 1);

                                 ^

                               (    )
2020-07-23 08:56:20 -05:00
Paul T. Bauman
2f51e75013 Use HYPRE_WARP_SIZE for shared memory alloc in blockReduceSum 2020-07-23 08:56:00 -05:00
Paul T. Bauman
950a747ae6 Use HYPRE_WARP_SIZE instead of hardcoded numbers
This hits the loop and if statements.
2020-07-23 08:26:42 -05:00
Victor A. Paludetto Magri
b075d64255
Merge pull request #155 from hypre-space/fix-caliper
Fix caliper usage
2020-07-20 10:24:08 -07:00
Victor A. P. Magri
d8a270c3fa Merge branch 'master' into fix-caliper 2020-07-18 23:44:21 -07:00
Victor A. P. Magri
5fca3a5f3d Annotate Setup levels of BoomerAMG 2020-07-17 13:58:09 -07:00
Victor A. P. Magri
163ef941b2 Annotate ILU 2020-07-17 13:57:43 -07:00
Victor A. P. Magri
d2c4df7f6f Annotate MGR 2020-07-17 13:57:33 -07:00
Victor A. Paludetto Magri
33f4232130
Merge pull request #147 from hypre-space/fix-fortint
Update Fortran interfaces in Struct
2020-07-16 14:04:08 -07:00
Victor A. P. Magri
1079429f79 Merge branch 'master' into fix-fortint 2020-07-16 14:02:56 -07:00
liruipeng
175dd59122 description of GPU options of AMG 2020-07-15 10:36:55 -07:00
Rob Falgout
42448bf066 Adding filter for 'HYPRE_config.h.in' in AUTOTEST/check-license.sh 2020-07-15 06:13:29 -07:00
Rob Falgout
f0b7c705ef
Merge pull request #150 from pbauman/use-autoheader
Use autoheader to generate HYPRE_config.h.in
2020-07-14 08:11:09 -07:00
Paul T. Bauman
2e4bc39f50 Updated configure from the bootstrap
I did this as a separate commit because this may just be
differences in autoconf version and so maybe we just strip
this from history. Note the vast majority of this is just whitespace.
2020-07-14 09:34:58 -05:00
Paul T. Bauman
24250fe92e Run bootstrap, regenerate HYPRE_config.h.in
autoheader sorts all the flags so it makes the diff hard to read.
We can see the difference more easily as follows.

Grep the old version (before this commit):
grep undef HYPRE_config.h.in | sort > old_config.txt

Grep the new version (after this commit):
grep undef HYPRE_config.h.in | sort > new_config.txt

Now diff:

diff old_config.txt new_config.txt
0a1,2
> #undef FC_DUMMY_MAIN
> #undef FC_DUMMY_MAIN_EQ_F77
2a5,6
> #undef HAVE_INTTYPES_H
> #undef HAVE_MEMORY_H
3a8,12
> #undef HAVE_MPI_COMM_F2C
> #undef HAVE_STDINT_H
> #undef HAVE_STDLIB_H
> #undef HAVE_STRING_H
> #undef HAVE_STRINGS_H
4a14,16
> #undef HAVE_SYS_STAT_H
> #undef HAVE_SYS_TYPES_H
> #undef HAVE_UNISTD_H
11d22
< #undef HYPRE_DEVICE_OPENMP_MAPPED
17a29
> #undef HYPRE_HPPA
58a71,77
> #undef PACKAGE_BUGREPORT
> #undef PACKAGE_NAME
> #undef PACKAGE_STRING
> #undef PACKAGE_TARNAME
> #undef PACKAGE_URL
> #undef PACKAGE_VERSION
> #undef STDC_HEADERS

So we pick up some stuff from autoconf and a few a missing
AC_DEFINES that weren't manually added before.
2020-07-14 09:34:58 -05:00
Paul T. Bauman
5b7ca434cd run autoheader after autoconf
This will then automatically generate the HYPRE_config.h.in file.
Thus developers will no longer need to edit that file manually.
2020-07-14 09:34:58 -05:00
Paul T. Bauman
dd8e7ba376 Add descriptions to AC_DEFINE
Using the "full" API is necessary for autoheader to work correctly.
2020-07-14 09:34:58 -05:00
Victor A. Paludetto Magri
ca195740fb
Merge pull request #144 from hypre-space/fix-bool
Fix usage of bool types in Euclid
2020-07-09 22:58:29 -07:00
Victor A. P. Magri
84423d95d1 Merge branch 'master' into fix-bool 2020-07-09 22:55:15 -07:00
Ruipeng Li
2ba72ed419
Merge pull request #149 from pbauman/fix-nvtx-build
Compile hypre_nvtx.c with nvcc
2020-07-09 11:12:00 -07:00
Paul T. Bauman
c10b129ce5 Compile hypre_nvtx.c with nvcc 2020-07-09 09:10:05 -05:00
Victor A. P. Magri
9ff066b52f Move some preprocessor directives before extern C 2020-07-08 23:41:30 -07:00
Victor A. P. Magri
14c9b050d6 Merge branch 'fix-bool' of https://github.com/hypre-space/hypre into fix-bool 2020-07-08 10:40:56 -07:00
Victor A. P. Magri
4b8bb0f5f0 Erase ifdef statement 2020-07-08 10:40:22 -07:00
Rob Falgout
8dd210957c Moved the autotest run filter to 'runtest.sh' where it belongs 2020-07-08 07:04:39 -07:00
Victor A. P. Magri
c94ba5842e Merge branch 'fix-bool' of https://github.com/hypre-space/hypre into fix-bool 2020-07-07 20:04:57 -07:00
Victor A. P. Magri
0be3e041f2 Use HYPRE_REAL_MIN 2020-07-07 20:03:12 -07:00
liruipeng
de87515b06 add a warning msg in headers 2020-07-07 17:20:53 -07:00
Victor A. P. Magri
f7673f1a31 Set atol to correct value when HYPRE_SINGLE is defined 2020-07-07 17:03:52 -07:00
Daniel Osei-Kuffuor
343e31c845
Merge pull request #148 from hypre-space/mgr-dev
Mgr dev
2020-07-07 16:39:07 -07:00
Daniel Osei-Kuffuor
04c4e06013 Minor cleanup 2020-07-07 16:30:33 -07:00