diff --git a/exaudfclient/.bazelrc b/exaudfclient/.bazelrc index 5ca3b697..c18d5cb4 100644 --- a/exaudfclient/.bazelrc +++ b/exaudfclient/.bazelrc @@ -26,4 +26,4 @@ build:valgrind -c dbg build:valgrind --copt -g build:valgrind --strip=never build:valgrind --copt -DVALGRIND_ACTIVE -build:fix_conda_ar_tool --action_env=AR=x86_64-conda-linux-gnu-gcc-ar --features=-archive_param_file \ No newline at end of file +build:fix_conda_ar_tool --features=-archive_param_file diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/ci.json b/flavors/template-Exasol-8-python-3.10-cuda-conda/ci.json index 6417437e..91ab757f 100644 --- a/flavors/template-Exasol-8-python-3.10-cuda-conda/ci.json +++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/ci.json @@ -1,5 +1,5 @@ { - "build_runners": ["int-linux-x64-4core-ubuntu24.04-1"], + "build_runners": ["int-linux-x64-4core-ubuntu24.04-1", "int-linux-arm-4core-ubuntu24.04-1"], "test_config": { "default_test_runners": ["int-linux-x64-2core-ubuntu24.04-1"], "test_sets": [ diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile index f27ba800..555207cf 100644 --- a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile +++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir /exaudfclient /exaudf COPY /exaudfclient/ /exaudfclient/ WORKDIR /exaudfclient/ -RUN bash -c "source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries" +RUN source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries --config fix_conda_ar_tool RUN cp -r -L bazel-bin/* /exaudf WORKDIR /exaudfclient/base diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_deps/Dockerfile b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_deps/Dockerfile index cc2e0782..d43e117d 100644 --- a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_deps/Dockerfile +++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_deps/Dockerfile @@ -5,7 +5,10 @@ RUN mkdir -p /build_info/packages COPY build_deps_packages.yml /build_info/packages/build_deps_packages.yml RUN exaslpm install --package-file /build_info/packages/build_deps_packages.yml --build-step build_deps -RUN curl -L -o swig-2.0.4.tar.gz https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \ +RUN exaslpm export-variables --out-file /env + +RUN curl -fsSL -o swig-2.0.4.tar.gz \ + https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \ tar zxf swig-2.0.4.tar.gz && \ - (cd swig-2.0.4 && ./configure --prefix=/usr && make && make install) && \ + (cd swig-2.0.4 && source /env && ./configure --build=$SWIG_BUILD_ARCH-unknown-linux-gnu --host=$HOST_PLATFORM-unknown-linux-gnu --prefix=/usr && make -j"$(nproc)" && make install) && \ rm -rf swig-2.0.4 swig-2.0.4.tar.gz diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile index 3ab04c75..6ae21cef 100644 --- a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile +++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile @@ -7,7 +7,7 @@ RUN exaslpm export-variables --out-file /env WORKDIR /exaudfclient/ -RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool" +RUN source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool RUN cp -r -L bazel-bin/* /exaudf WORKDIR /exaudfclient/base diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/packages.yml b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/packages.yml index bb8f9b55..51828791 100644 --- a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/packages.yml +++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/packages.yml @@ -16,9 +16,9 @@ build_steps: version: '=4.3' - name: chrpath version: '=0.16' - - name: gxx_linux-64 + - name: gxx version: =13.4.0 - - name: gcc_linux-64 + - name: gcc version: =13.4.0 binary: Mamba variables: @@ -26,6 +26,9 @@ build_steps: LD_LIBRARY_PATH: '$LD_LIBRARY_PATH:$MAMBA_ROOT_PREFIX/lib/' CPLUS_INCLUDE_PATH: '$CPLUS_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/' C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/' + SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}" + HOST_PLATFORM: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}" + AR: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}-conda-linux-gnu-gcc-ar" validation_cfg: version_mandatory: true - name: base_test_deps diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/packages.yml b/flavors/template-Exasol-8-python-3.10-cuda-conda/packages.yml index d145e3d0..8920176e 100644 --- a/flavors/template-Exasol-8-python-3.10-cuda-conda/packages.yml +++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/packages.yml @@ -70,7 +70,7 @@ build_steps: - name: cuda-toolkit version: =12.9.1 - name: libarrow - version: =22.0.0=h552f9d5_3_cuda + version: =22.0.0=*_cuda - name: mamba version: =2.3.3 binary: Micromamba diff --git a/flavors/template-Exasol-8-python-3.12-cuda-conda/ci.json b/flavors/template-Exasol-8-python-3.12-cuda-conda/ci.json index 6417437e..91ab757f 100644 --- a/flavors/template-Exasol-8-python-3.12-cuda-conda/ci.json +++ b/flavors/template-Exasol-8-python-3.12-cuda-conda/ci.json @@ -1,5 +1,5 @@ { - "build_runners": ["int-linux-x64-4core-ubuntu24.04-1"], + "build_runners": ["int-linux-x64-4core-ubuntu24.04-1", "int-linux-arm-4core-ubuntu24.04-1"], "test_config": { "default_test_runners": ["int-linux-x64-2core-ubuntu24.04-1"], "test_sets": [ diff --git a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/base_test_build_run/Dockerfile index 571e11ae..26623b7b 100644 --- a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/base_test_build_run/Dockerfile +++ b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/base_test_build_run/Dockerfile @@ -11,7 +11,7 @@ COPY /exaudfclient/ /exaudfclient/ WORKDIR /exaudfclient/ -RUN bash -c "source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries" +RUN source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries --config fix_conda_ar_tool RUN cp -r -L bazel-bin/* /exaudf diff --git a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_deps/Dockerfile b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_deps/Dockerfile index cc2e0782..d43e117d 100644 --- a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_deps/Dockerfile +++ b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_deps/Dockerfile @@ -5,7 +5,10 @@ RUN mkdir -p /build_info/packages COPY build_deps_packages.yml /build_info/packages/build_deps_packages.yml RUN exaslpm install --package-file /build_info/packages/build_deps_packages.yml --build-step build_deps -RUN curl -L -o swig-2.0.4.tar.gz https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \ +RUN exaslpm export-variables --out-file /env + +RUN curl -fsSL -o swig-2.0.4.tar.gz \ + https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \ tar zxf swig-2.0.4.tar.gz && \ - (cd swig-2.0.4 && ./configure --prefix=/usr && make && make install) && \ + (cd swig-2.0.4 && source /env && ./configure --build=$SWIG_BUILD_ARCH-unknown-linux-gnu --host=$HOST_PLATFORM-unknown-linux-gnu --prefix=/usr && make -j"$(nproc)" && make install) && \ rm -rf swig-2.0.4 swig-2.0.4.tar.gz diff --git a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_run/Dockerfile index 35dc10c1..ce52b90b 100644 --- a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_run/Dockerfile +++ b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_run/Dockerfile @@ -7,7 +7,7 @@ RUN exaslpm export-variables --out-file /env WORKDIR /exaudfclient/ -RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool" +RUN source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool RUN cp -r -L bazel-bin/* /exaudf WORKDIR /exaudfclient/base diff --git a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/packages.yml b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/packages.yml index 488d8c77..5c048f32 100644 --- a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/packages.yml +++ b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/packages.yml @@ -16,9 +16,9 @@ build_steps: version: =4.4.1 - name: chrpath version: '=0.16' - - name: gxx_linux-64 + - name: gxx version: =13.4.0 - - name: gcc_linux-64 + - name: gcc version: =13.4.0 binary: Mamba variables: @@ -26,6 +26,9 @@ build_steps: LD_LIBRARY_PATH: '$LD_LIBRARY_PATH:$MAMBA_ROOT_PREFIX/lib/' CPLUS_INCLUDE_PATH: '$CPLUS_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/' C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/' + SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}" + HOST_PLATFORM: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}" + AR: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}-conda-linux-gnu-gcc-ar" validation_cfg: version_mandatory: true - name: base_test_deps diff --git a/flavors/template-Exasol-8-python-3.12-cuda-conda/packages.yml b/flavors/template-Exasol-8-python-3.12-cuda-conda/packages.yml index d6d39b9f..0ca9eafe 100644 --- a/flavors/template-Exasol-8-python-3.12-cuda-conda/packages.yml +++ b/flavors/template-Exasol-8-python-3.12-cuda-conda/packages.yml @@ -70,7 +70,7 @@ build_steps: - name: pyarrow version: =22.0.0 - name: libarrow - version: =22.0.0=h552f9d5_3_cuda + version: =22.0.0=*_cuda - name: mamba version: =2.3.3 - name: cuda-toolkit diff --git a/flavors/template-Exasol-all-python-3.10-conda/ci.json b/flavors/template-Exasol-all-python-3.10-conda/ci.json index bce1c17a..77390081 100644 --- a/flavors/template-Exasol-all-python-3.10-conda/ci.json +++ b/flavors/template-Exasol-all-python-3.10-conda/ci.json @@ -1,5 +1,5 @@ { - "build_runners": ["ubuntu-22.04"], + "build_runners": ["ubuntu-22.04", "ubuntu-22.04-arm"], "test_config": { "default_test_runners": ["ubuntu-22.04"], "test_sets": [ diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_build_run/Dockerfile index b6b9efe9..0680c99a 100644 --- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_build_run/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_build_run/Dockerfile @@ -11,7 +11,7 @@ COPY /exaudfclient/ /exaudfclient/ WORKDIR /exaudfclient/ # We need to build with optimize here, because the debug build fails to run with a runtime linking error regarding protobuf -RUN bash -c "source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries" +RUN source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries --config fix_conda_ar_tool RUN cp -r -L bazel-bin/* /exaudf WORKDIR /exaudfclient/base diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/Dockerfile index cc2e0782..d43e117d 100644 --- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/Dockerfile @@ -5,7 +5,10 @@ RUN mkdir -p /build_info/packages COPY build_deps_packages.yml /build_info/packages/build_deps_packages.yml RUN exaslpm install --package-file /build_info/packages/build_deps_packages.yml --build-step build_deps -RUN curl -L -o swig-2.0.4.tar.gz https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \ +RUN exaslpm export-variables --out-file /env + +RUN curl -fsSL -o swig-2.0.4.tar.gz \ + https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \ tar zxf swig-2.0.4.tar.gz && \ - (cd swig-2.0.4 && ./configure --prefix=/usr && make && make install) && \ + (cd swig-2.0.4 && source /env && ./configure --build=$SWIG_BUILD_ARCH-unknown-linux-gnu --host=$HOST_PLATFORM-unknown-linux-gnu --prefix=/usr && make -j"$(nproc)" && make install) && \ rm -rf swig-2.0.4 swig-2.0.4.tar.gz diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile index fa3a6786..2e317037 100644 --- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile @@ -7,7 +7,7 @@ COPY exaudfclient/ /exaudfclient/ WORKDIR /exaudfclient/ -RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config fast-binary --config fix_conda_ar_tool" +RUN source /env && ./build.sh --config no-tty --config optimize --config python --config fast-binary --config fix_conda_ar_tool RUN cp -r -L bazel-bin/* /exaudf WORKDIR /exaudfclient/base diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/packages.yml b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/packages.yml index c396c903..cba1d439 100644 --- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/packages.yml +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/packages.yml @@ -12,9 +12,9 @@ build_steps: version: '=8.45' - name: bazel version: =8.3.1 - - name: gxx_linux-64 + - name: gxx version: =12.4.0 - - name: gcc_linux-64 + - name: gcc version: =12.4.0 - name: make version: '=4.3' @@ -26,6 +26,9 @@ build_steps: LD_LIBRARY_PATH: '$LD_LIBRARY_PATH:$MAMBA_ROOT_PREFIX/lib/' CPLUS_INCLUDE_PATH: '$CPLUS_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/' C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/' + SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}" + HOST_PLATFORM: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}" + AR: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}-conda-linux-gnu-gcc-ar" validation_cfg: version_mandatory: true - name: base_test_deps diff --git a/flavors/template-Exasol-all-python-3.12-conda/ci.json b/flavors/template-Exasol-all-python-3.12-conda/ci.json index 1d17fd67..634fc08c 100644 --- a/flavors/template-Exasol-all-python-3.12-conda/ci.json +++ b/flavors/template-Exasol-all-python-3.12-conda/ci.json @@ -1,5 +1,5 @@ { - "build_runners": ["ubuntu-24.04"], + "build_runners": ["ubuntu-24.04", "ubuntu-24.04-arm"], "test_config": { "default_test_runners": ["ubuntu-24.04"], "test_sets": [ diff --git a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/base_test_build_run/Dockerfile index f27ba800..555207cf 100644 --- a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/base_test_build_run/Dockerfile +++ b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/base_test_build_run/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir /exaudfclient /exaudf COPY /exaudfclient/ /exaudfclient/ WORKDIR /exaudfclient/ -RUN bash -c "source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries" +RUN source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries --config fix_conda_ar_tool RUN cp -r -L bazel-bin/* /exaudf WORKDIR /exaudfclient/base diff --git a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_deps/Dockerfile b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_deps/Dockerfile index cc2e0782..d43e117d 100644 --- a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_deps/Dockerfile +++ b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_deps/Dockerfile @@ -5,7 +5,10 @@ RUN mkdir -p /build_info/packages COPY build_deps_packages.yml /build_info/packages/build_deps_packages.yml RUN exaslpm install --package-file /build_info/packages/build_deps_packages.yml --build-step build_deps -RUN curl -L -o swig-2.0.4.tar.gz https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \ +RUN exaslpm export-variables --out-file /env + +RUN curl -fsSL -o swig-2.0.4.tar.gz \ + https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \ tar zxf swig-2.0.4.tar.gz && \ - (cd swig-2.0.4 && ./configure --prefix=/usr && make && make install) && \ + (cd swig-2.0.4 && source /env && ./configure --build=$SWIG_BUILD_ARCH-unknown-linux-gnu --host=$HOST_PLATFORM-unknown-linux-gnu --prefix=/usr && make -j"$(nproc)" && make install) && \ rm -rf swig-2.0.4 swig-2.0.4.tar.gz diff --git a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_run/Dockerfile index 92166c29..1bd281c6 100644 --- a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_run/Dockerfile +++ b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_run/Dockerfile @@ -6,7 +6,7 @@ RUN mkdir /exaudfclient /exaudf COPY exaudfclient/ /exaudfclient/ WORKDIR /exaudfclient/ -RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config fast-binary --config fix_conda_ar_tool" +RUN source /env && ./build.sh --config no-tty --config optimize --config python --config fast-binary --config fix_conda_ar_tool RUN cp -r -L bazel-bin/* /exaudf WORKDIR /exaudfclient/base diff --git a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/packages.yml b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/packages.yml index fabbb732..17a3526f 100644 --- a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/packages.yml +++ b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/packages.yml @@ -16,16 +16,19 @@ build_steps: version: =4.4.1 - name: chrpath version: '=0.16' - - name: gxx_linux-64 + - name: gxx version: =15.1.0 - - name: gcc_linux-64 + - name: gcc version: =15.1.0 - binary: Mamba + binary: Mamba variables: PROTOBUF_BIN: '$MAMBA_ROOT_PREFIX/bin/protoc' LD_LIBRARY_PATH: '$LD_LIBRARY_PATH:$MAMBA_ROOT_PREFIX/lib/' CPLUS_INCLUDE_PATH: '$CPLUS_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/' C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/' + SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}" + HOST_PLATFORM: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}" + AR: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}-conda-linux-gnu-gcc-ar" validation_cfg: version_mandatory: true - name: base_test_deps diff --git a/flavors/test-Exasol-8-cuda-ml/ci.json b/flavors/test-Exasol-8-cuda-ml/ci.json index 2366dab5..ba75da97 100644 --- a/flavors/test-Exasol-8-cuda-ml/ci.json +++ b/flavors/test-Exasol-8-cuda-ml/ci.json @@ -1,5 +1,5 @@ { - "build_runners": ["int-linux-x64-4core-ubuntu24.04-1"], + "build_runners": ["int-linux-x64-4core-ubuntu24.04-1", "int-linux-arm-4core-ubuntu24.04-1"], "test_config": { "default_test_runners": ["int-linux-x64-2core-ubuntu24.04-1"], "test_sets": [ diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/base_test_build_run/Dockerfile b/flavors/test-Exasol-8-cuda-ml/flavor_base/base_test_build_run/Dockerfile index f27ba800..555207cf 100644 --- a/flavors/test-Exasol-8-cuda-ml/flavor_base/base_test_build_run/Dockerfile +++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/base_test_build_run/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir /exaudfclient /exaudf COPY /exaudfclient/ /exaudfclient/ WORKDIR /exaudfclient/ -RUN bash -c "source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries" +RUN source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries --config fix_conda_ar_tool RUN cp -r -L bazel-bin/* /exaudf WORKDIR /exaudfclient/base diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile index bf7cc313..679b1ada 100644 --- a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile +++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile @@ -5,8 +5,12 @@ RUN mkdir -p /build_info/packages COPY build_deps_packages.yml /build_info/packages/build_deps_packages.yml RUN exaslpm install --package-file /build_info/packages/build_deps_packages.yml --build-step build_deps -RUN curl -L -o swig-2.0.4.tar.gz https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \ +RUN exaslpm export-variables --out-file /env + +RUN curl -fsSL -o swig-2.0.4.tar.gz \ + https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \ tar zxf swig-2.0.4.tar.gz && \ - (cd swig-2.0.4 && ./configure --prefix=/usr && make && make install) && \ + (cd swig-2.0.4 && source /env && ./configure --build=$SWIG_BUILD_ARCH-unknown-linux-gnu --host=$HOST_PLATFORM-unknown-linux-gnu --prefix=/usr && make -j"$(nproc)" && make install) && \ rm -rf swig-2.0.4 swig-2.0.4.tar.gz + diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile index 3ab04c75..6ae21cef 100644 --- a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile +++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile @@ -7,7 +7,7 @@ RUN exaslpm export-variables --out-file /env WORKDIR /exaudfclient/ -RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool" +RUN source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool RUN cp -r -L bazel-bin/* /exaudf WORKDIR /exaudfclient/base diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml b/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml index 488d8c77..5c048f32 100644 --- a/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml +++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml @@ -16,9 +16,9 @@ build_steps: version: =4.4.1 - name: chrpath version: '=0.16' - - name: gxx_linux-64 + - name: gxx version: =13.4.0 - - name: gcc_linux-64 + - name: gcc version: =13.4.0 binary: Mamba variables: @@ -26,6 +26,9 @@ build_steps: LD_LIBRARY_PATH: '$LD_LIBRARY_PATH:$MAMBA_ROOT_PREFIX/lib/' CPLUS_INCLUDE_PATH: '$CPLUS_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/' C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/' + SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}" + HOST_PLATFORM: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}" + AR: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}-conda-linux-gnu-gcc-ar" validation_cfg: version_mandatory: true - name: base_test_deps diff --git a/flavors/test-Exasol-8-cuda-ml/packages.yml b/flavors/test-Exasol-8-cuda-ml/packages.yml index b54c7c4c..4cf7b08d 100644 --- a/flavors/test-Exasol-8-cuda-ml/packages.yml +++ b/flavors/test-Exasol-8-cuda-ml/packages.yml @@ -70,7 +70,7 @@ build_steps: - name: pyarrow version: =22.0.0 - name: libarrow - version: =22.0.0=h552f9d5_3_cuda + version: =22.0.0=*_cuda - name: mamba version: =2.3.3 binary: Micromamba @@ -109,7 +109,7 @@ build_steps: - name: numba-cuda version: =0.20.0 - name: pytorch - version: =2.8.0=cuda129_generic_py312_h464b887_201 + version: =2.8.0=cuda129_generic_py312_* binary: Mamba validation_cfg: version_mandatory: true