diff --git a/.github/workflows/double-precision.yml b/.github/workflows/double-precision.yml index b0ca087ef4..cda708a4a9 100644 --- a/.github/workflows/double-precision.yml +++ b/.github/workflows/double-precision.yml @@ -3,6 +3,9 @@ name: Build and Test - Ubuntu/gcc double precision (TPLs, no GPUs) on: push: + branches: + - main + - develop pull_request: merge_group: workflow_dispatch: diff --git a/.github/workflows/extended-precision.yml b/.github/workflows/extended-precision.yml index 51678b6e70..2c521b2fad 100644 --- a/.github/workflows/extended-precision.yml +++ b/.github/workflows/extended-precision.yml @@ -2,6 +2,10 @@ name: Build and Test - Ubuntu/gcc extended precision (TPLs, no GPUs) on: + push: + branches: + - main + - develop pull_request: merge_group: workflow_dispatch: diff --git a/.github/workflows/single-precision.yml b/.github/workflows/single-precision.yml index 30a53b0402..d986643256 100644 --- a/.github/workflows/single-precision.yml +++ b/.github/workflows/single-precision.yml @@ -2,6 +2,10 @@ name: Build and Test - Ubuntu/gcc single precision (TPLs, no GPUs) on: + push: + branches: + - main + - develop pull_request: merge_group: workflow_dispatch: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63622ebb08..c02b239373 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,6 +126,8 @@ stages: # This is where jobs are included. include: + - project: 'lc-templates/id_tokens' + file: 'id_tokens.yml' - local: .gitlab/quartz-templates.yml - local: .gitlab/quartz-jobs.yml - local: .gitlab/lassen-templates.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 44adec3f08..0b86ccff1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -86,6 +86,9 @@ ARKODE's SPRKStep time-stepping module. Fixed a bug in `ARKodeSPRKTable_Create` where the coefficient arrays were not allocated. +Fix bug on LLP64 platforms (like Windows 64-bit) where `KLU_INDEXTYPE` could be +32 bits wide even if `SUNDIALS_INT64_T` is defined. + ### Deprecation Notices Numerous ARKODE stepper-specific functions are now deprecated in favor of diff --git a/doc/shared/RecentChanges.rst b/doc/shared/RecentChanges.rst index cd12404033..982acbeee4 100644 --- a/doc/shared/RecentChanges.rst +++ b/doc/shared/RecentChanges.rst @@ -84,6 +84,9 @@ ARKODE's SPRKStep time-stepping module. Fixed a bug in :c:func:`ARKodeSPRKTable_Create` where the coefficient arrays were not allocated. +Fix bug on LLP64 platforms (like Windows 64-bit) where ``KLU_INDEXTYPE`` could be +32 bits wide even if ``SUNDIALS_INT64_T`` is defined. + **Deprecation Notices** Numerous ARKODE stepper-specific functions are now deprecated in favor of @@ -91,4 +94,4 @@ ARKODE-wide functions. Deprecated ``ARKStepSetOptimalParams`` function. This functions does not have an ARKODE-wide equivalent, instructions have been added to the user guide for how -to retain the current functionality using other user-callable functions. +to retain the current functionality using other user-callable functions. \ No newline at end of file diff --git a/src/sunlinsol/klu/sunlinsol_klu.c b/src/sunlinsol/klu/sunlinsol_klu.c index cbdaa54135..568dc1d549 100644 --- a/src/sunlinsol/klu/sunlinsol_klu.c +++ b/src/sunlinsol/klu/sunlinsol_klu.c @@ -16,6 +16,7 @@ * the SUNLINSOL package. * -----------------------------------------------------------------*/ +#include #include #include #include @@ -49,7 +50,7 @@ */ #if defined(SUNDIALS_INT64_T) -#define KLU_INDEXTYPE long int +#define KLU_INDEXTYPE int64_t #else #define KLU_INDEXTYPE int #endif