Skip to content

Commit

Permalink
Merge pull request #1348 from anarkiwi/noworker
Browse files Browse the repository at this point in the history
remove worker.
  • Loading branch information
anarkiwi authored Jul 13, 2024
2 parents 9a10849 + 7c809fa commit 513502c
Show file tree
Hide file tree
Showing 17 changed files with 1 addition and 1,226 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/docker-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,13 @@ jobs:
docker build -f docker/Dockerfile.vkfft . -t iqtlabs/gamutrf-vkfft:latest
docker build -f docker/Dockerfile.sigmf docker -t iqtlabs/gamutrf-sigmf:latest
docker build -f docker/Dockerfile.driver docker -t iqtlabs/gamutrf-driver:latest
docker build -f docker/Dockerfile.uhd-sr . -t iqtlabs/gamutrf-uhd-sr:latest
docker build -f docker/Dockerfile.base docker -t iqtlabs/gamutrf-base:latest
docker rmi -f iqtlabs/gamutrf-vkfft:latest iqtlabs/gamutrf-driver:latest iqtlabs/gamutrf-uhd-sr:latest
docker rmi -f iqtlabs/gamutrf-vkfft:latest iqtlabs/gamutrf-driver:latest
docker build -f Dockerfile . -t iqtlabs/gamutrf:latest
docker build -f docker/Dockerfile.torchsig . -t iqtlabs/gamutrf-torchsig:latest
docker run -t iqtlabs/gamutrf:latest gamutrf-compress_dirs --help
docker run -t iqtlabs/gamutrf:latest gamutrf-offline --help
docker run -t iqtlabs/gamutrf:latest gamutrf-scan --help
docker run -t iqtlabs/gamutrf:latest gamutrf-worker --help
- name: offline consistency
# VkFFT is more consistent, but still not perfectly consistent.
run: |
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,6 @@ jobs:
push: true
tags: iqtlabs/gamutrf-driver:${{ steps.change_version.outputs.VERSION }}
if: github.repository == 'iqtlabs/gamutrf' && github.event_name == 'push'
- name: Build and push platforms uhd-sr
uses: docker/build-push-action@v6
with:
context: .
file: docker/Dockerfile.uhd-sr
platforms: linux/amd64,linux/arm64
push: true
tags: iqtlabs/gamutrf-uhd-sr:${{ steps.change_version.outputs.VERSION }}
if: github.repository == 'iqtlabs/gamutrf' && github.event_name == 'push'
- name: Build and push platforms base
uses: docker/build-push-action@v6
with:
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ RUN for i in bjoern falcon-cors gpsd-py3 ; do poetry run pip install --no-cache-
RUN poetry install --no-interaction --no-ansi --no-dev --no-root
COPY gamutrf gamutrf/
COPY bin bin/
COPY templates templates/
RUN poetry install --no-interaction --no-ansi --no-dev

# nosemgrep:github.workflows.config.dockerfile-source-not-pinned
Expand Down Expand Up @@ -86,6 +85,5 @@ COPY --from=installer /root/.local /root/.local
RUN ldconfig -v
WORKDIR /gamutrf
RUN echo "$(find /gamutrf/gamutrf -type f -name \*py -print)"|xargs grep -Eh "^(import|from)\s"|grep -Ev "gamutrf"|sort|uniq|python3
RUN ldd /usr/local/bin/uhd_sample_recorder
# nosemgrep:github.workflows.config.missing-user
CMD ["gamutrf-scan", "--help"]
1 change: 0 additions & 1 deletion docker/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& apt-get -y -q clean && rm -rf /var/lib/apt/lists/*
COPY --from=iqtlabs/gnuradio:3.10.10.0 /usr/local /usr/local
COPY --from=iqtlabs/gamutrf-driver /usr/local /usr/local
COPY --from=iqtlabs/gamutrf-uhd-sr /usr/local /usr/local
COPY --from=gr-iqtlabs-builder /usr/local /usr/local
RUN ldconfig -v
RUN python3 -c "from gnuradio import soapy, iqtlabs ; from gnuradio.iqtlabs import vkfft"
24 changes: 0 additions & 24 deletions docker/Dockerfile.uhd-sr

This file was deleted.

6 changes: 0 additions & 6 deletions gamutrf/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from gamutrf.compress_dirs import main as compress_dirs_main
from gamutrf.offline import main as offline_main
from gamutrf.scan import main as scan_main
from gamutrf.worker import main as worker_main


def compress_dirs():
Expand All @@ -19,8 +18,3 @@ def offline():
def scan():
"""Entrypoint for scan"""
scan_main()


def worker():
"""Entrypoint for worker"""
worker_main()
53 changes: 0 additions & 53 deletions gamutrf/birdseye_rssi.py

This file was deleted.

Loading

0 comments on commit 513502c

Please sign in to comment.