Remove portable install using nehalem, must use avx enabled CPU (2010+)

.github/workflows/publish-docker.yaml

@@ -39,7 +39,7 @@ jobs:
       id: docker_build
       uses: docker/build-push-action@v2
       with:
-        file: ./portable.Dockerfile
+        file: ./Dockerfile
         platforms: linux/amd64,linux/arm64
         push: true
         no-cache: true

.github/workflows/test-build-prs.yaml

@@ -20,10 +20,10 @@ jobs:
     - name: Build
       uses: docker/build-push-action@v2
       with:
-        file: ./portable.Dockerfile
+        file: ./Dockerfile
         platforms: linux/amd64
         push: false
-  
+
   # snapcraft:
   #   runs-on: ubuntu-latest
   #   strategy:

configure.sh

@@ -140,26 +140,12 @@ installreqs() {
     # edt requires numpy to build
     venv/bin/pip install numpy==2.3.2
     venv/bin/pip install -r requirements.txt --ignore-installed
-    #if [ ! -z "$GPU_INSTALL" ]; then
-    #fi
     set +e
 }
 
 install() {
     installreqs
 
-    if [ ! -z "$PORTABLE_INSTALL" ]; then
-        echo "Replacing g++ and gcc with our scripts for portability..."
-        if [ ! -e /usr/bin/gcc_real ]; then
-            sudo mv -v /usr/bin/gcc /usr/bin/gcc_real
-            sudo cp -v ./docker/gcc /usr/bin/gcc
-        fi
-        if [ ! -e /usr/bin/g++_real ]; then
-            sudo mv -v /usr/bin/g++ /usr/bin/g++_real
-            sudo cp -v ./docker/g++ /usr/bin/g++
-        fi
-    fi
-
     set -eo pipefail
 
     echo "Compiling SuperBuild"

gpu.Dockerfile

@@ -3,7 +3,7 @@ FROM nvidia/cuda:13.0.0-devel-ubuntu24.04 AS builder
 # Env variables
 ENV DEBIAN_FRONTEND=noninteractive \
     PYTHONPATH="/code/SuperBuild/install/lib/python3.12/dist-packages:/code/SuperBuild/install/bin/opensfm" \
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib"
+    LD_LIBRARY_PATH="/code/SuperBuild/install/lib"
 
 # Prepare directories
 WORKDIR /code
@@ -12,7 +12,7 @@ WORKDIR /code
 COPY . ./
 
 # Run the build
-RUN PORTABLE_INSTALL=YES GPU_INSTALL=YES bash configure.sh install
+RUN bash configure.sh install
 
 # Run the tests
 ENV PATH="/code/venv/bin:$PATH"
@@ -30,7 +30,7 @@ FROM nvidia/cuda:13.0.0-devel-ubuntu24.04
 # Env variables
 ENV DEBIAN_FRONTEND=noninteractive \
     PYTHONPATH="/code/SuperBuild/install/lib/python3.12/dist-packages:/code/SuperBuild/install/bin/opensfm" \
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib" \
+    LD_LIBRARY_PATH="/code/SuperBuild/install/lib" \
     PDAL_DRIVER_PATH="/code/SuperBuild/install/bin"
 
 WORKDIR /code
@@ -40,12 +40,13 @@ COPY --from=builder /code /code
 
 ENV PATH="/code/venv/bin:$PATH"
 
-RUN apt-get update -y \
- && apt-get install -y ffmpeg libtbb2
 # Install shared libraries that we depend on via APT, but *not*
 # the -dev packages to save space!
 # Also run a smoke test on ODM and OpenSfM
-RUN bash configure.sh installruntimedepsonly \
+RUN apt-get update -y \
+  # ffmpeg & libtbb2 needed for GPU build only
+  && apt-get install -y ffmpeg libtbb2 \
+  && bash configure.sh installruntimedepsonly \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
   && bash run.sh --help \

snap/snapcraft.yaml

@@ -155,12 +155,6 @@ parts:
     override-build: |
       snapcraftctl set-version $(cat VERSION)
 
-      # Portable build
-      test -f /usr/bin/gcc_real || mv -v /usr/bin/gcc /usr/bin/gcc_real
-      test -f /usr/bin/gcc || cp -v ./docker/gcc /usr/bin/gcc
-      test -f /usr/bin/g++_real || mv -v /usr/bin/g++ /usr/bin/g++_real
-      test -f /usr/bin/g++ || cp -v ./docker/g++ /usr/bin/g++
-
       pip3 install --user -r requirements.txt
 
       # Build the SuperBuild libraries

snap/snapcraft21.yaml

@@ -155,12 +155,6 @@ parts:
     override-build: |
       snapcraftctl set-version $(cat VERSION)
 
-      # Portable build
-      test -f /usr/bin/gcc_real || mv -v /usr/bin/gcc /usr/bin/gcc_real
-      test -f /usr/bin/gcc || cp -v ./docker/gcc /usr/bin/gcc
-      test -f /usr/bin/g++_real || mv -v /usr/bin/g++ /usr/bin/g++_real
-      test -f /usr/bin/g++ || cp -v ./docker/g++ /usr/bin/g++
-
       pip3 install --user -r requirements.txt
 
       # Build the SuperBuild libraries

snap/snapcraft24.yaml

@@ -157,12 +157,6 @@ parts:
     override-build: |
       snapcraftctl set-version $(cat VERSION)
 
-      # Portable build
-      test -f /usr/bin/gcc_real || mv -v /usr/bin/gcc /usr/bin/gcc_real
-      test -f /usr/bin/gcc || cp -v ./docker/gcc /usr/bin/gcc
-      test -f /usr/bin/g++_real || mv -v /usr/bin/g++ /usr/bin/g++_real
-      test -f /usr/bin/g++ || cp -v ./docker/g++ /usr/bin/g++
-
       pip3 install --user -r requirements.txt
 
       # Build the SuperBuild libraries