Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use specific implementation to get available host memory on MacOS #2597

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

use specific implementation to get available host memory on MacOS #2597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7133d78
use specific implementation ti get available host memory on MacOS
XL64 Jul 24, 2023
2c10b6a
uncrustify
XL64 Jul 24, 2023
6f1f3c1
remove wrong code
XL64 Jul 25, 2023
b9d17f1
use getAvailableMemoryOnHost() and getAvailableMemoryOnDevice() from …
XL64 Jul 25, 2023
b75e9b4
fix includes
XL64 Jul 26, 2023
fa12329
fix includes
XL64 Jul 26, 2023
8064c87
uncrustify
XL64 Jul 26, 2023
c513af2
prgma once not supported by Apple clang version 14.0.3 (clang-1403.0.…
XL64 Jul 26, 2023
8f0287a
includes
XL64 Jul 26, 2023
fef0ea9
unused variable
XL64 Jul 26, 2023
267844a
typo
XL64 Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreComponents/LvArray
Open in desktop
Submodule LvArray updated 2 files
+59 −0 src/system.cpp
+16 −4 src/system.hpp
5 changes: 2 additions & 3 deletions src/coreComponents/common/LifoStorageCommon.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include <mutex>
#include <condition_variable>
#include <camp/camp.hpp>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <algorithm>
Expand All @@ -38,7 +37,7 @@
#include "common/TimingMacros.hpp"
#include "common/FixedSizeDequeWithMutexes.hpp"
#include "common/MultiMutexesLock.hpp"

#include "LvArray/src/system.hpp"

namespace geos
{
Expand Down Expand Up @@ -155,7 +154,7 @@ class LifoStorageCommon
static int computeNumberOfBufferOnHost( int percent, size_t bufferSize, int maxNumberOfBuffers, int numberOfBuffersToStoreOnDevice )
{
GEOS_ERROR_IF( percent > 100, "Error, percentage of memory should be smallerer than -100, check lifoOnHost (should be greater that -100)" );
size_t free = sysconf( _SC_AVPHYS_PAGES ) * sysconf( _SC_PAGESIZE );
size_t free = LvArray::system::getAvailableMemoryOnHost();
int numberOfBuffersToStoreOnHost = std::max( 1, std::min( ( int )( 0.01 * percent * free / bufferSize ), maxNumberOfBuffers - numberOfBuffersToStoreOnDevice ) );
double freeGB = ( ( double ) free ) / ( 1024.0 * 1024.0 * 1024.0 ) / MpiWrapper::nodeCommSize();
LIFO_LOG_RANK( " LIFO : available memory on host " << freeGB << " GB" );
Expand Down
5 changes: 2 additions & 3 deletions src/coreComponents/common/LifoStorageCuda.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include <camp/camp.hpp>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <algorithm>

#include "common/FixedSizeDeque.hpp"
Expand All @@ -30,6 +29,7 @@
#include "common/FixedSizeDequeWithMutexes.hpp"
#include "common/MultiMutexesLock.hpp"
#include "common/LifoStorageCommon.hpp"
#include "LvArray/src/system.hpp"

namespace geos
{
Expand Down Expand Up @@ -147,8 +147,7 @@ class LifoStorageCuda : public LifoStorageCommon< T, INDEX_TYPE >
static int computeNumberOfBufferOnDevice( int percent, size_t bufferSize, int maxNumberOfBuffers )
{
GEOS_ERROR_IF( percent > 100, "Error, percentage of memory should be smaller than 100, check lifoOnDevice (should be greater than -100)" );
size_t free, total;
GEOS_ERROR_IF( cudaSuccess != cudaMemGetInfo( &free, &total ), "Error getting CUDA device available memory" );
size_t free = LvArray::system::getAvailableMemoryOnDevice();
double freeGB = ( ( double ) free ) / ( 1024.0 * 1024.0 * 1024.0 );
LIFO_LOG_RANK( " LIFO : available memory on device " << freeGB << " GB" );
return std::min( ( int )( 0.01 * percent * free / bufferSize ), maxNumberOfBuffers );
Expand Down