From 135023c7d75dfd44252d80c8b60a4871d5dab3d2 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Thu, 16 Jan 2025 22:58:32 +0100 Subject: [PATCH 1/4] Update default chunk_cache_size in support of https://github.com/Unidata/netcdf-c/3067 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac853e0cb1..fc42e5c696 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -358,7 +358,7 @@ endif() # Default Cache variables. set(DEFAULT_CHUNK_SIZE 16777216 CACHE STRING "Default Chunk Cache Size.") -set(DEFAULT_CHUNK_CACHE_SIZE 16777216U CACHE STRING "Default Chunk Cache Size.") +set(DEFAULT_CHUNK_CACHE_SIZE 67108864U CACHE STRING "Default Chunk Cache Size.") set(DEFAULT_CHUNKS_IN_CACHE 1000 CACHE STRING "Default number of chunks in cache.") set(DEFAULT_CHUNK_CACHE_PREEMPTION 0.75 CACHE STRING "Default file chunk cache preemption policy (a number between 0 and 1, inclusive).") From 4c333ca297339b954227baf105b7e262360eb808 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Thu, 16 Jan 2025 23:09:08 +0100 Subject: [PATCH 2/4] Add cache fix to configure.ac --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2f4b4a22ed..1f027cfced 100644 --- a/configure.ac +++ b/configure.ac @@ -396,7 +396,7 @@ AC_MSG_CHECKING([whether a default cache size was specified]) AC_ARG_WITH([default-chunk-cache-size], [AS_HELP_STRING([--with-default-chunk-cache-size=], [Specify default size (in bytes) for chunk cache.])], - [DEFAULT_CHUNK_CACHE_SIZE=$with_default_chunk_cache_size], [DEFAULT_CHUNK_CACHE_SIZE=16777216U]) + [DEFAULT_CHUNK_CACHE_SIZE=$with_default_chunk_cache_size], [DEFAULT_CHUNK_CACHE_SIZE=67108864U]) AC_MSG_RESULT([$DEFAULT_CHUNK_CACHE_SIZE]) AC_DEFINE_UNQUOTED([DEFAULT_CHUNK_CACHE_SIZE], [$DEFAULT_CHUNK_CACHE_SIZE], [default size of the chunk cache.]) From befd964586eb69716355009a56581fde83d2ca50 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Thu, 16 Jan 2025 23:45:58 +0100 Subject: [PATCH 3/4] Fix an error in the cygwin workflows --- .github/workflows/run_tests_win_cygwin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_tests_win_cygwin.yml b/.github/workflows/run_tests_win_cygwin.yml index 7c01e5dd05..1e41192003 100644 --- a/.github/workflows/run_tests_win_cygwin.yml +++ b/.github/workflows/run_tests_win_cygwin.yml @@ -93,8 +93,8 @@ jobs: with: name: cygwin-autotools-test-logs-${{ github.run_id }} path: | - */*.log - */*.trs + */*.log + */*.trs build-and-test-cmake: name: Cygwin-based CMake tests From 11e2a277862d7be0af4e0ed912e6f197f4434add Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 17 Jan 2025 00:27:25 +0100 Subject: [PATCH 4/4] Attempted fix for a cygwin artifact name collision --- .github/workflows/run_tests_win_cygwin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests_win_cygwin.yml b/.github/workflows/run_tests_win_cygwin.yml index 1e41192003..54e8d0affb 100644 --- a/.github/workflows/run_tests_win_cygwin.yml +++ b/.github/workflows/run_tests_win_cygwin.yml @@ -91,7 +91,7 @@ jobs: - name: Upload autoconf test results uses: actions/upload-artifact@v4 with: - name: cygwin-autotools-test-logs-${{ github.run_id }} + name: cygwin-autotools-test-logs-${{ matrix.plugin_dir_option }} path: | */*.log */*.trs