| 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 4 | #define ARMA_VERSION_MAJOR 4 | |||
| #define ARMA_VERSION_MINOR 450 | #define ARMA_VERSION_MINOR 450 | |||
| #define ARMA_VERSION_PATCH 3 | #define ARMA_VERSION_PATCH 4 | |||
| #define ARMA_VERSION_NAME "Spring Hill Fort" | #define ARMA_VERSION_NAME "Spring Hill Fort" | |||
| 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 | |||
| config.hpp | config.hpp | |||
|---|---|---|---|---|
| skipping to change at line 91 | skipping to change at line 91 | |||
| //// Note that ARMA_USE_U64S64 is automatically enabled when ARMA_64BIT_WOR D or ARMA_USE_CXX11 are enabled | //// Note that ARMA_USE_U64S64 is automatically enabled when ARMA_64BIT_WOR D or ARMA_USE_CXX11 are enabled | |||
| #endif | #endif | |||
| #if !defined(ARMA_USE_HDF5) | #if !defined(ARMA_USE_HDF5) | |||
| /* #undef ARMA_USE_HDF5 */ | /* #undef ARMA_USE_HDF5 */ | |||
| //// Uncomment the above line to allow the ability to save and load matrice s stored in HDF5 format; | //// Uncomment the above line to allow the ability to save and load matrice s stored in HDF5 format; | |||
| //// the hdf5.h header file must be available on your system, | //// the hdf5.h header file must be available on your system, | |||
| //// and you will need to link with the hdf5 library (eg. -lhdf5) | //// and you will need to link with the hdf5 library (eg. -lhdf5) | |||
| #endif | #endif | |||
| /* #undef ARMA_USE_HDF5_ALT */ | ||||
| #if defined(ARMA_USE_HDF5_ALT) && defined(ARMA_USE_WRAPPER) | ||||
| #undef ARMA_USE_HDF5 | ||||
| #define ARMA_USE_HDF5 | ||||
| #endif | ||||
| #if !defined(ARMA_MAT_PREALLOC) | #if !defined(ARMA_MAT_PREALLOC) | |||
| #define ARMA_MAT_PREALLOC 16 | #define ARMA_MAT_PREALLOC 16 | |||
| #endif | #endif | |||
| //// This is the number of preallocated elements used by matrices and vecto rs; | //// This is the number of preallocated elements used by matrices and vecto rs; | |||
| //// it must be an integer that is at least 1. | //// it must be an integer that is at least 1. | |||
| //// If you mainly use lots of very small vectors (eg. <= 4 elements), | //// If you mainly use lots of very small vectors (eg. <= 4 elements), | |||
| //// change the number to the size of your vectors. | //// change the number to the size of your vectors. | |||
| #if !defined(ARMA_SPMAT_CHUNKSIZE) | #if !defined(ARMA_SPMAT_CHUNKSIZE) | |||
| #define ARMA_SPMAT_CHUNKSIZE 256 | #define ARMA_SPMAT_CHUNKSIZE 256 | |||
| End of changes. 1 change blocks. | ||||
| 0 lines changed or deleted | 6 lines changed or added | |||
| hdf5_bones.hpp | hdf5_bones.hpp | |||
|---|---|---|---|---|
| // Copyright (C) 2014 Ryan Curtin | // Copyright (C) 2014 Ryan Curtin | |||
| // | // | |||
| // 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/. | |||
| // This defines all the names of the HDF5 functions Armadillo will use. | ||||
| #if defined(ARMA_USE_HDF5) | #if defined(ARMA_USE_HDF5) | |||
| // These macros only need to be defined if the wrapper is not being used. | #if !defined(ARMA_USE_HDF5_ALT) | |||
| // Otherwise, the function names and type names as they appear in hdf5_misc | ||||
| .hpp | // macros needed if the wrapper run-time library is not being used | |||
| // will work just fine, but we need to define prototypes for the wrapper | ||||
| // functions that will appear in wrapper.cpp. | ||||
| #if !defined(ARMA_USE_WRAPPER) | ||||
| #define arma_H5Tcopy H5Tcopy | #define arma_H5Tcopy H5Tcopy | |||
| #define arma_H5Tcreate H5Tcreate | #define arma_H5Tcreate H5Tcreate | |||
| #define arma_H5Tinsert H5Tinsert | #define arma_H5Tinsert H5Tinsert | |||
| #define arma_H5Tequal H5Tequal | #define arma_H5Tequal H5Tequal | |||
| #define arma_H5Tclose H5Tclose | #define arma_H5Tclose H5Tclose | |||
| #define arma_H5Dopen H5Dopen | #define arma_H5Dopen H5Dopen | |||
| #define arma_H5Dget_type H5Dget_type | #define arma_H5Dget_type H5Dget_type | |||
| #define arma_H5Dclose H5Dclose | #define arma_H5Dclose H5Dclose | |||
| skipping to change at line 61 | skipping to change at line 57 | |||
| #define arma_H5T_NATIVE_UINT H5T_NATIVE_UINT | #define arma_H5T_NATIVE_UINT H5T_NATIVE_UINT | |||
| #define arma_H5T_NATIVE_LONG H5T_NATIVE_LONG | #define arma_H5T_NATIVE_LONG H5T_NATIVE_LONG | |||
| #define arma_H5T_NATIVE_ULONG H5T_NATIVE_ULONG | #define arma_H5T_NATIVE_ULONG H5T_NATIVE_ULONG | |||
| #define arma_H5T_NATIVE_LLONG H5T_NATIVE_LLONG | #define arma_H5T_NATIVE_LLONG H5T_NATIVE_LLONG | |||
| #define arma_H5T_NATIVE_ULLONG H5T_NATIVE_ULLONG | #define arma_H5T_NATIVE_ULLONG H5T_NATIVE_ULLONG | |||
| #define arma_H5T_NATIVE_FLOAT H5T_NATIVE_FLOAT | #define arma_H5T_NATIVE_FLOAT H5T_NATIVE_FLOAT | |||
| #define arma_H5T_NATIVE_DOUBLE H5T_NATIVE_DOUBLE | #define arma_H5T_NATIVE_DOUBLE H5T_NATIVE_DOUBLE | |||
| #else | #else | |||
| // prototypes for the wrapper functions defined in the wrapper run-time lib | ||||
| rary (src/wrapper.cpp) | ||||
| extern "C" | extern "C" | |||
| { | { | |||
| // Wrapper functions for H5* functions. | // Wrapper functions for H5* functions. | |||
| hid_t arma_H5Tcopy(hid_t dtype_id); | hid_t arma_H5Tcopy(hid_t dtype_id); | |||
| hid_t arma_H5Tcreate(H5T_class_t cl, size_t size); | hid_t arma_H5Tcreate(H5T_class_t cl, size_t size); | |||
| herr_t arma_H5Tinsert(hid_t dtype_id, const char* name, size_t offset, hi d_t field_id); | herr_t arma_H5Tinsert(hid_t dtype_id, const char* name, size_t offset, hi d_t field_id); | |||
| htri_t arma_H5Tequal(hid_t dtype_id1, hid_t dtype_id2); | htri_t arma_H5Tequal(hid_t dtype_id1, hid_t dtype_id2); | |||
| herr_t arma_H5Tclose(hid_t dtype_id); | herr_t arma_H5Tclose(hid_t dtype_id); | |||
| hid_t arma_H5Dopen(hid_t loc_id, const char* name, hid_t dapl_id); | hid_t arma_H5Dopen(hid_t loc_id, const char* name, hid_t dapl_id); | |||
| End of changes. 3 change blocks. | ||||
| 8 lines changed or deleted | 6 lines changed or added | |||