Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
28 changes: 27 additions & 1 deletion fesom2_test_refactoring/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ RUN apt-get update \
&& apt-get -y install cmake vim git git-lfs libnetcdf-dev libnetcdff-dev libpmix-dev libpmi2-0-dev libpmi2-0t64 \
&& apt-get -y install wget \
&& apt-get -y install nco cdo netcdf-bin \
&& apt-get -y install python3-pip python3-tk libudunits2-dev libproj-dev proj-bin libgeos-dev libcunit1-dev
&& apt-get -y install python3-pip python3-tk libudunits2-dev libproj-dev proj-bin libgeos-dev libcunit1-dev \
&& apt-get -y install libhdf5-dev perl uuid-dev

WORKDIR /fesom/

Expand All @@ -34,6 +35,31 @@ RUN pip install 'setuptools<80' \
WORKDIR /fesom/
RUN mkdir results

# XIOS 2.5: copy source + make_xios build to /xios. Sequential NetCDF is
# sufficient because the run-tests use XIOS in attached mode (no separate
# server ranks). The xios/ directory below is duplicated from
# fesom2_ci/xios/ — keep them in sync if the XIOS source ever needs to be
# refreshed.
#
# Two arch-GCC_LINUX overrides:
# - .env: upstream hardcodes $HOME/hdf5 and $HOME/netcdf4; rewrite to Ubuntu
# serial library paths so make_xios's `source arch.env` gives valid roots.
# - .fcm: upstream BASE_CFLAGS sets -ansi (= C++98) which forbids C++11
# lambdas as template args. XIOS 2.5 uses those (e.g. distribute_file_server2.cpp).
# Append -std=c++11 to override -ansi for C++ compilation.
COPY xios /xios
RUN printf '%s\n' \
'export HDF5_INC_DIR=/usr/include/hdf5/serial' \
'export HDF5_LIB_DIR=/usr/lib/x86_64-linux-gnu/hdf5/serial' \
'export NETCDF_INC_DIR=/usr/include' \
'export NETCDF_LIB_DIR=/usr/lib/x86_64-linux-gnu' \
> /xios/arch/arch-GCC_LINUX.env \
&& sed -i 's|^%BASE_CFLAGS .*|%BASE_CFLAGS -ansi -w -fPIC -std=c++11|' \
/xios/arch/arch-GCC_LINUX.fcm \
&& cd /xios \
&& ./make_xios --arch GCC_LINUX --fcm new \
--netcdf_lib netcdf4_seq --job $(nproc)




Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
(apply,CacheStats{hitCount=3211, missCount=2466, loadSuccessCount=2456, loadExceptionCount=0, totalLoadTime=161060158891, evictionCount=0})
(tree,CacheStats{hitCount=16327, missCount=6034, loadSuccessCount=4808, loadExceptionCount=0, totalLoadTime=267214651457, evictionCount=0})
(commit,CacheStats{hitCount=1236, missCount=1236, loadSuccessCount=1236, loadExceptionCount=0, totalLoadTime=14504775704, evictionCount=0})
(tag,CacheStats{hitCount=0, missCount=0, loadSuccessCount=0, loadExceptionCount=0, totalLoadTime=0, evictionCount=0})
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
23041028674d6ca9279dafd1daf2609da1e31af3 13588480 boost.tar
1bb303eae7ca299e508a252719bc328444408274 177270166 test_client.exe
3152c1bdb8fd6b7edb8a607b34032269684a448a 166236380 xios_server.exe
48e23024e402a71a1abafa81674b4f731e5be8d0 166236419 xios_server1.exe
6c3c76fe8e2c0621ceed0f582586a966100886ea 166236419 xios_server2.exe

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
(apply,CacheStats{hitCount=3957, missCount=2978, loadSuccessCount=2970, loadExceptionCount=0, totalLoadTime=163190529522, evictionCount=0})
(tree,CacheStats{hitCount=16558, missCount=6409, loadSuccessCount=4817, loadExceptionCount=0, totalLoadTime=221567927113, evictionCount=0})
(commit,CacheStats{hitCount=1751, missCount=1750, loadSuccessCount=1750, loadExceptionCount=0, totalLoadTime=41462232503, evictionCount=0})
(tag,CacheStats{hitCount=0, missCount=0, loadSuccessCount=0, loadExceptionCount=0, totalLoadTime=0, evictionCount=0})
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
1bb303eae7ca299e508a252719bc328444408274 177270166 test_client.exe
3152c1bdb8fd6b7edb8a607b34032269684a448a 166236380 xios_server.exe
48e23024e402a71a1abafa81674b4f731e5be8d0 166236419 xios_server1.exe
6c3c76fe8e2c0621ceed0f582586a966100886ea 166236419 xios_server2.exe

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions fesom2_test_refactoring/xios/.void_file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Loading
Loading