Skip to content

Commit

Permalink
Update files related to SPRAL
Browse files Browse the repository at this point in the history
  • Loading branch information
amontoison committed Dec 10, 2023
1 parent 33214d7 commit dd627ab
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 31 deletions.
8 changes: 0 additions & 8 deletions include/spral_compat.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@

#include "spral_config.h"

// #ifndef HAVE_STD_ALIGN
// // Older versions of g++ (and intel that relies on equivalent -lstdc++) don't
// // define std::align, so we do it ourselves.
// namespace std {
// void* align(std::size_t alignment, std::size_t size, void*& ptr, std::size_t& space) noexcept;
// } /* namespace std */
// #endif /* HAVE_STD_ALIGN */

#ifndef _OPENMP
inline int omp_get_thread_num(void) { return 0; }
inline int omp_get_num_threads(void) { return 1; }
Expand Down
6 changes: 3 additions & 3 deletions include/spral_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
#define PACKAGE_NAME "spral"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "spral 2016.06.24"
#define PACKAGE_STRING "spral 2023.11.15"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "spral"
Expand All @@ -90,7 +90,7 @@
#define PACKAGE_URL ""

/* Define to the version of this package. */
#define PACKAGE_VERSION "2016.06.24"
#define PACKAGE_VERSION "2023.11.15"

/* Define to 1 to enable profiling */
/* #undef PROFILE */
Expand All @@ -99,4 +99,4 @@
#define STDC_HEADERS 1

/* Version number of package */
#define VERSION "2016.06.24"
#define VERSION "2023.11.15"
20 changes: 0 additions & 20 deletions src/spral/compat.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,3 @@
#else
#undef HAVE_SCHED_GETCPU
#endif

// #ifndef HAVE_STD_ALIGN
// Older versions of g++ (and intel that relies on equivalent -lstdc++) don't
// define std::align, so we do it ourselves.
// If there is insufficient space, return nullptr
// namespace std {
// void* align(std::size_t alignment, std::size_t size, void*& ptr, std::size_t& space) noexcept {
// auto cptr = reinterpret_cast<uintptr_t>(ptr);
// auto pad = cptr % alignment;
// if(pad == 0) return (size>space) ? nullptr : ptr;
// pad = alignment - pad;
// if(size+pad > space) return nullptr;
// cptr += pad;
// space -= pad;
// ptr = reinterpret_cast<void*>(cptr);
// return ptr;
// }
// } /* namespace std */
// #endif

0 comments on commit dd627ab

Please sign in to comment.