Merge pull request #955 from anarkiwi/ts

Build gamutRF image with bespoke torchsig libraries, for new augmenta…

.github/workflows/docker-test.yml

@@ -29,6 +29,7 @@ jobs:
         docker build -f Dockerfile.base . -t iqtlabs/gamutrf-base:latest
         cd ..
         docker build -f Dockerfile . -t iqtlabs/gamutrf:latest
+        docker build -f docker/Dockerfile.torchsig docker -t iqtlabs/gamutrf-torchsig:latest
         docker run -t iqtlabs/gamutrf:latest gamutrf-scan --help
         docker run -t iqtlabs/gamutrf:latest gamutrf-sigfinder --help
         docker run -t iqtlabs/gamutrf:latest gamutrf-api --help

.github/workflows/docker.yml

@@ -84,3 +84,12 @@ jobs:
         push: true
         tags: iqtlabs/gamutrf:${{ steps.change_version.outputs.VERSION }}
       if: github.repository == 'iqtlabs/gamutrf' && github.event_name == 'push'
+    - name: Build and push gamutrf-torchsig
+      uses: docker/build-push-action@v5
+      with:
+        context: docker
+        file: docker/Dockerfile.torchsig
+        platforms: linux/amd64,linux/arm64
+        push: true
+        tags: iqtlabs/gamutrf-torchsig:${{ steps.change_version.outputs.VERSION }}
+      if: github.repository == 'iqtlabs/gamutrf' && github.event_name == 'push'

docker/Dockerfile.torchsig

@@ -0,0 +1,19 @@
+FROM ubuntu:22.04 as torchsig-builder
+WORKDIR /root
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && apt-get install -y --no-install-recommends build-essential ca-certificates cmake git python3-pip python3-dev && pip install -U pip
+# Cause torch CPU only to be installed, no cuda dependencies
+RUN pip install torch --extra-index-url https://download.pytorch.org/whl/cpu
+RUN git clone https://github.com/TorchDSP/torchsig -b v0.4.1
+WORKDIR /root/torchsig
+RUN sed -i -E "s/torch==[0-9\.]+/torch/g" pyproject.toml
+RUN pip install .
+
+FROM iqtlabs/gamutrf:latest
+WORKDIR /root
+ENV DEBIAN_FRONTEND noninteractive
+# TODO: find a better way cherrypick just Torchsig itself, without Torch et al. Torchsig transforms have dependencies on
+# Torch, even though we don't need Torch for the standalone transforms we want.
+COPY --from=torchsig-builder /usr/local/lib/python3.10/dist-packages /usr/local/lib/python3.10/dist-packages
+RUN python3 -c "from torchsig.transforms import transforms"
+RUN python3 -c "from gamutrf import grscan"