From 030b956cd00864e1678be03c835c6c27ab7f4666 Mon Sep 17 00:00:00 2001 From: Matteo Cusini Date: Tue, 2 Jul 2024 16:30:24 -0700 Subject: [PATCH 1/5] check for existence of_ SC_AVPHYS_PAGES --- src/coreComponents/common/MemoryInfos.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/coreComponents/common/MemoryInfos.cpp b/src/coreComponents/common/MemoryInfos.cpp index 98b0093c82f..145fff87f7a 100644 --- a/src/coreComponents/common/MemoryInfos.cpp +++ b/src/coreComponents/common/MemoryInfos.cpp @@ -27,8 +27,13 @@ MemoryInfos::MemoryInfos( umpire::MemoryResourceTraits::resource_type resourceTy case umpire::MemoryResourceTraits::resource_type::pinned: #if defined( _SC_PHYS_PAGES ) && defined( _SC_PAGESIZE ) m_totalMemory = sysconf( _SC_PHYS_PAGES ) * sysconf( _SC_PAGESIZE ); + #if defined(_SC_AVPHYS_PAGES) m_availableMemory = sysconf( _SC_AVPHYS_PAGES ) * sysconf( _SC_PAGESIZE ); #else + GEOS_WARNING( "Unknown device avaialable memory size getter for this system." ); + m_availableMemory = 0; + #endif + #else GEOS_WARNING( "Unknown device physical memory size getter for this compiler." ); m_physicalMemoryHandled = 0; #endif From f543ad6b2bdb5f37a23ecd0240e3329a9d95dca4 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Fri, 5 Jul 2024 20:55:22 -0700 Subject: [PATCH 2/5] add mac build...check out size of runner --- .github/workflows/ci_tests.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 7396cf889b9..d1ead3bea02 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -238,6 +238,15 @@ jobs: GCP_BUCKET: geosx/ubuntu22.04-gcc11 RUNS_ON: Runner_4core_16GB + mac_builds: + needs: + - is_not_draft_pull_request + runs-on: macos-14-xlarge + steps: + - run: nproc + - run: sysctl -h hw.memsize + + # If the 'ci: run CUDA builds' PR label is found, the cuda jobs run immediately along side linux jobs. # Note: CUDA jobs should only be run if PR is ready to merge. cuda_builds: From 456d425ccf60f67f669e69b79e9f24c774a7120b Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Fri, 5 Jul 2024 20:57:44 -0700 Subject: [PATCH 3/5] add mac build...check out size of runner --- .github/workflows/ci_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index d1ead3bea02..21ab71dd929 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -243,7 +243,7 @@ jobs: - is_not_draft_pull_request runs-on: macos-14-xlarge steps: - - run: nproc + - run: sysctl -n hw.physicalcpu - run: sysctl -h hw.memsize From 5f6fc66907c837046a27cc534d07ef0960389b9c Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Fri, 5 Jul 2024 21:55:12 -0700 Subject: [PATCH 4/5] add mac build...check out size of runner --- .github/workflows/ci_tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 21ab71dd929..49e7fb3115c 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -245,6 +245,7 @@ jobs: steps: - run: sysctl -n hw.physicalcpu - run: sysctl -h hw.memsize + - run: sysctl -n machdep.cpu.brand_string # If the 'ci: run CUDA builds' PR label is found, the cuda jobs run immediately along side linux jobs. From e8a54a7ea57ddeb3496257ba45c752cd3209ba46 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Fri, 5 Jul 2024 23:23:25 -0700 Subject: [PATCH 5/5] comment out mac ci build --- .github/workflows/ci_tests.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 49e7fb3115c..28bcfcbcc33 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -238,14 +238,14 @@ jobs: GCP_BUCKET: geosx/ubuntu22.04-gcc11 RUNS_ON: Runner_4core_16GB - mac_builds: - needs: - - is_not_draft_pull_request - runs-on: macos-14-xlarge - steps: - - run: sysctl -n hw.physicalcpu - - run: sysctl -h hw.memsize - - run: sysctl -n machdep.cpu.brand_string + # mac_builds: + # needs: + # - is_not_draft_pull_request + # runs-on: macos-14-xlarge + # steps: + # - run: sysctl -n hw.physicalcpu + # - run: sysctl -h hw.memsize + # - run: sysctl -n machdep.cpu.brand_string # If the 'ci: run CUDA builds' PR label is found, the cuda jobs run immediately along side linux jobs.