| arma_version.hpp | arma_version.hpp | |||
|---|---|---|---|---|
| skipping to change at line 13 | skipping to change at line 13 | |||
| // | // | |||
| // This Source Code Form is subject to the terms of the Mozilla Public | // This Source Code Form is subject to the terms of the Mozilla Public | |||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | // License, v. 2.0. If a copy of the MPL was not distributed with this | |||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/. | // file, You can obtain one at http://mozilla.org/MPL/2.0/. | |||
| //! \addtogroup arma_version | //! \addtogroup arma_version | |||
| //! @{ | //! @{ | |||
| #define ARMA_VERSION_MAJOR 3 | #define ARMA_VERSION_MAJOR 3 | |||
| #define ARMA_VERSION_MINOR 900 | #define ARMA_VERSION_MINOR 900 | |||
| #define ARMA_VERSION_PATCH 5 | #define ARMA_VERSION_PATCH 6 | |||
| #define ARMA_VERSION_NAME "Bavarian Sunflower" | #define ARMA_VERSION_NAME "Bavarian Sunflower" | |||
| struct arma_version | struct arma_version | |||
| { | { | |||
| static const unsigned int major = ARMA_VERSION_MAJOR; | static const unsigned int major = ARMA_VERSION_MAJOR; | |||
| static const unsigned int minor = ARMA_VERSION_MINOR; | static const unsigned int minor = ARMA_VERSION_MINOR; | |||
| static const unsigned int patch = ARMA_VERSION_PATCH; | static const unsigned int patch = ARMA_VERSION_PATCH; | |||
| static | static | |||
| inline | inline | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||
| compiler_setup.hpp | compiler_setup.hpp | |||
|---|---|---|---|---|
| skipping to change at line 46 | skipping to change at line 46 | |||
| #define arma_fortran_prefix(function) arma_fortran2_prefix(function) | #define arma_fortran_prefix(function) arma_fortran2_prefix(function) | |||
| #define arma_fortran_noprefix(function) arma_fortran2_noprefix(function) | #define arma_fortran_noprefix(function) arma_fortran2_noprefix(function) | |||
| #define ARMA_INCFILE_WRAP(x) <x> | #define ARMA_INCFILE_WRAP(x) <x> | |||
| #if ( ((_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)) && !defined( __MINGW32__) && !defined(__APPLE__) ) | #if ( ((_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)) && !defined( __MINGW32__) && !defined(__APPLE__) ) | |||
| #define ARMA_HAVE_POSIX_MEMALIGN | #define ARMA_HAVE_POSIX_MEMALIGN | |||
| #endif | #endif | |||
| #if defined(__APPLE__) | ||||
| #define ARMA_BLAS_SDOT_BUG | ||||
| #endif | ||||
| #if (__cplusplus >= 201103L) | #if (__cplusplus >= 201103L) | |||
| #if !defined(ARMA_USE_CXX11) | #if !defined(ARMA_USE_CXX11) | |||
| #define ARMA_USE_CXX11 | #define ARMA_USE_CXX11 | |||
| #endif | #endif | |||
| #endif | #endif | |||
| #if defined(ARMA_USE_CXX11) | #if defined(ARMA_USE_CXX11) | |||
| #if !defined(ARMA_USE_U64S64) | #if !defined(ARMA_USE_U64S64) | |||
| #define ARMA_USE_U64S64 | #define ARMA_USE_U64S64 | |||
| #endif | #endif | |||
| skipping to change at line 70 | skipping to change at line 74 | |||
| #define ARMA_USE_U64S64 | #define ARMA_USE_U64S64 | |||
| #endif | #endif | |||
| #endif | #endif | |||
| #if defined(__INTEL_COMPILER) | #if defined(__INTEL_COMPILER) | |||
| #if (__INTEL_COMPILER < 1000) | #if (__INTEL_COMPILER < 1000) | |||
| #error "*** Need a newer compiler ***" | #error "*** Need a newer compiler ***" | |||
| #endif | #endif | |||
| #define ARMA_GOOD_COMPILER | ||||
| #undef ARMA_HAVE_STD_TR1 | ||||
| #if (__INTEL_COMPILER <= 1110) | #if (__INTEL_COMPILER <= 1110) | |||
| #undef ARMA_HAVE_STD_ISFINITE | #undef ARMA_HAVE_STD_ISFINITE | |||
| #endif | #endif | |||
| // #undef arma_aligned | #undef ARMA_HAVE_STD_TR1 | |||
| // #define arma_aligned __attribute__((aligned(16))) | ||||
| #define ARMA_GOOD_COMPILER | ||||
| #define ARMA_HAVE_ICC_ASSUME_ALIGNED | ||||
| #if defined(__GNUG__) | ||||
| // #undef arma_aligned | ||||
| // #define arma_aligned __attribute__((aligned)) | ||||
| #if defined(_MSC_VER) | ||||
| #undef arma_align_mem | ||||
| #define arma_align_mem __declspec(align(16)) | ||||
| #else | ||||
| #undef arma_align_mem | #undef arma_align_mem | |||
| #define arma_align_mem __attribute__((aligned(16))) | #define arma_align_mem __attribute__((aligned(16))) | |||
| #endif | ||||
| #define ARMA_HAVE_ALIGNED_ATTRIBUTE | #define ARMA_HAVE_ALIGNED_ATTRIBUTE | |||
| #define ARMA_HAVE_ICC_ASSUME_ALIGNED | ||||
| #elif defined(_MSC_VER) | ||||
| // #if (_MANAGED == 1) || (_M_CEE == 1) | ||||
| // | ||||
| // // don't do any alignment when compiling in "managed code" mode | ||||
| // | ||||
| // #undef arma_aligned | ||||
| // #define arma_aligned | ||||
| // | ||||
| // #undef arma_align_mem | ||||
| // #define arma_align_mem | ||||
| // | ||||
| // #elif (_MSC_VER >= 1700) | ||||
| // | ||||
| // #undef arma_align_mem | ||||
| // #define arma_align_mem __declspec(align(16)) | ||||
| // | ||||
| // #define ARMA_HAVE_ALIGNED_ATTRIBUTE | ||||
| // | ||||
| // #endif | ||||
| #endif | ||||
| #elif defined(__GNUG__) | #elif defined(__GNUG__) | |||
| #if (__GNUC__ < 4) | #if (__GNUC__ < 4) | |||
| #error "*** Need a newer compiler ***" | #error "*** Need a newer compiler ***" | |||
| #endif | #endif | |||
| #define ARMA_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNU C_PATCHLEVEL__) | #define ARMA_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNU C_PATCHLEVEL__) | |||
| #define ARMA_GOOD_COMPILER | #define ARMA_GOOD_COMPILER | |||
| skipping to change at line 165 | skipping to change at line 190 | |||
| #if (ARMA_GCC_VERSION >= 40700) | #if (ARMA_GCC_VERSION >= 40700) | |||
| #define ARMA_HAVE_GCC_ASSUME_ALIGNED | #define ARMA_HAVE_GCC_ASSUME_ALIGNED | |||
| // TODO: future versions of clang may also have __builtin_assume_aligne d | // TODO: future versions of clang may also have __builtin_assume_aligne d | |||
| #endif | #endif | |||
| #undef ARMA_GCC_VERSION | #undef ARMA_GCC_VERSION | |||
| #endif | #endif | |||
| #if defined(__APPLE__) | ||||
| #define ARMA_BLAS_SDOT_BUG | ||||
| #endif | ||||
| #if defined(_MSC_VER) | #if defined(_MSC_VER) | |||
| #if (_MSC_VER < 1500) | #if (_MSC_VER < 1500) | |||
| #error "*** Need a newer compiler ***" | #error "*** Need a newer compiler ***" | |||
| #endif | #endif | |||
| #undef ARMA_GOOD_COMPILER | #undef ARMA_GOOD_COMPILER | |||
| #undef ARMA_HAVE_STD_ISFINITE | #undef ARMA_HAVE_STD_ISFINITE | |||
| #undef ARMA_HAVE_STD_SNPRINTF | #undef ARMA_HAVE_STD_SNPRINTF | |||
| #undef ARMA_HAVE_LOG1P | #undef ARMA_HAVE_LOG1P | |||
| skipping to change at line 203 | skipping to change at line 224 | |||
| #pragma warning(disable: 4514) // unreferenced inline function has been removed | #pragma warning(disable: 4514) // unreferenced inline function has been removed | |||
| #pragma warning(disable: 4522) // multiple assignment operators specifie d | #pragma warning(disable: 4522) // multiple assignment operators specifie d | |||
| #pragma warning(disable: 4623) // default constructor can't be generated | #pragma warning(disable: 4623) // default constructor can't be generated | |||
| #pragma warning(disable: 4624) // destructor can't be generated | #pragma warning(disable: 4624) // destructor can't be generated | |||
| #pragma warning(disable: 4625) // copy constructor can't be generated | #pragma warning(disable: 4625) // copy constructor can't be generated | |||
| #pragma warning(disable: 4626) // assignment operator can't be generated | #pragma warning(disable: 4626) // assignment operator can't be generated | |||
| #pragma warning(disable: 4710) // function not inlined | #pragma warning(disable: 4710) // function not inlined | |||
| #pragma warning(disable: 4711) // call was inlined | #pragma warning(disable: 4711) // call was inlined | |||
| #pragma warning(disable: 4714) // __forceinline can't be inlined | #pragma warning(disable: 4714) // __forceinline can't be inlined | |||
| #if (_MANAGED == 1) || (_M_CEE == 1) | // #if (_MANAGED == 1) || (_M_CEE == 1) | |||
| // | ||||
| // don't do any alignment when compiling in "managed code" mode | // // don't do any alignment when compiling in "managed code" mode | |||
| // | ||||
| #else | // #undef arma_aligned | |||
| // #undef arma_aligned | // #define arma_aligned | |||
| // #define arma_aligned __declspec(align(16)) | // | |||
| // #undef arma_align_mem | ||||
| #undef arma_align_mem | // #define arma_align_mem | |||
| #define arma_align_mem __declspec(align(16)) | // | |||
| // #elif (_MSC_VER >= 1700) | ||||
| #define ARMA_HAVE_ALIGNED_ATTRIBUTE | // | |||
| // #undef arma_align_mem | ||||
| // disable warnings: "structure was padded due to __declspec(align(16)) | // #define arma_align_mem __declspec(align(16)) | |||
| " | // | |||
| #pragma warning(disable: 4324) | // #define ARMA_HAVE_ALIGNED_ATTRIBUTE | |||
| // | ||||
| #endif | // // disable warnings: "structure was padded due to __declspec(align(1 | |||
| 6))" | ||||
| // #pragma warning(disable: 4324) | ||||
| // | ||||
| // #endif | ||||
| #endif | #endif | |||
| #if defined(__CUDACC__) | #if defined(__CUDACC__) | |||
| #undef ARMA_HAVE_STD_ISFINITE | #undef ARMA_HAVE_STD_ISFINITE | |||
| #undef ARMA_HAVE_STD_SNPRINTF | #undef ARMA_HAVE_STD_SNPRINTF | |||
| #undef ARMA_HAVE_LOG1P | #undef ARMA_HAVE_LOG1P | |||
| #undef ARMA_HAVE_STD_ISINF | #undef ARMA_HAVE_STD_ISINF | |||
| #undef ARMA_HAVE_STD_ISNAN | #undef ARMA_HAVE_STD_ISNAN | |||
| #undef ARMA_HAVE_STD_TR1 | #undef ARMA_HAVE_STD_TR1 | |||
| End of changes. 8 change blocks. | ||||
| 34 lines changed or deleted | 59 lines changed or added | |||