Skip to content

Commit

Permalink
Fixed issue when not using Umpire. (#234)
Browse files Browse the repository at this point in the history
  • Loading branch information
corbett5 authored May 7, 2021
1 parent 7eadcd0 commit 3fece6b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cmake_minimum_required( VERSION 3.9 )
# Set version number
set( LVARRAY_VERSION_MAJOR 0 )
set( LVARRAY_VERSION_MINOR 2 )
set( LVARRAY_VERSION_PATCHLEVEL 0 )
set( LVARRAY_VERSION_PATCHLEVEL 1 )

# check if LvArray is build as a submodule or a separate project
get_directory_property( parent_dir PARENT_DIRECTORY )
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![DOI](https://zenodo.org/badge/132042682.svg)](https://zenodo.org/badge/latestdoi/132042682)

# LvArray
Description
-----------
Expand All @@ -13,7 +15,6 @@ LvArray provides:
All components of LvArray provide smart management of data motion between memory
spaces on systems with hetergeneous memory (e.g. CPU/GPU) through lambda copy
semantics in [RAJA](https://github.com/LLNL/RAJA), similar to the implementation of the [CHAI::ManagedArray](https://github.com/LLNL/CHAI)


Documentation
-------------
Expand Down
6 changes: 6 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ Version vxx.yy.zz -- Release date 20yy-mm-dd

* Bug fixes:

Version v0.2.1 -- Release date 2020-05-06
============================================

* Bug fixes:
* Fixed an issue when building without Umpire.

Version v0.2.0 -- Release date 2020-05-05
============================================

Expand Down
2 changes: 1 addition & 1 deletion src/CRSMatrixView.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ class CRSMatrixView : protected SparsityPatternView< COL_TYPE, INDEX_TYPE, BUFFE
inline void zero() const
{
#if !defined( LVARRAY_USE_UMPIRE )
LVARRAY_ERROR_IF_NE_MSG( getPreviousSpace(), MemorySpace::host, "Without Umpire only host memory is supported." );
LVARRAY_ERROR_IF_NE_MSG( m_entries.getPreviousSpace(), MemorySpace::host, "Without Umpire only host memory is supported." );
#endif

if( m_entries.capacity() > 0 )
Expand Down

0 comments on commit 3fece6b

Please sign in to comment.