Skip to content

Commit

Permalink
Merge pull request #1279 from anarkiwi/logpath
Browse files Browse the repository at this point in the history
log griqtlabs path.
  • Loading branch information
anarkiwi authored May 17, 2024
2 parents c510ea6 + 09afb15 commit 43f03da
Show file tree
Hide file tree
Showing 5 changed files with 346 additions and 341 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ jobs:
env:
PYTHONPATH: /usr/local/lib/python3.10/dist-packages:/usr/lib/python3/dist-packages
run: |
ldconfig -p|grep iqtlabs
poetry run pytest --cov-report term-missing --cov=. --cov-report=xml tests/ gamutrfwaterfall/tests
- name: Upload coverage
uses: codecov/codecov-action@v4
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libvulkan-dev \
python3-numpy
WORKDIR /root
RUN git clone https://github.com/iqtlabs/gr-iqtlabs -b 1.0.103
RUN git clone https://github.com/iqtlabs/gr-iqtlabs -b 1.0.104
COPY --from=iqtlabs/gamutrf-vkfft:latest /root /root/gr-iqtlabs
WORKDIR /root/gr-iqtlabs/build
COPY --from=iqtlabs/gamutrf-sigmf:latest /usr/local /usr/local
RUN cmake .. && make -j "$(nproc)" && make install
RUN cmake .. && make -j "$(nproc)" && make install && find /usr/local -name \*.a -delete

FROM ubuntu:22.04
ENV DEBIAN_FRONTEND noninteractive
Expand Down
9 changes: 9 additions & 0 deletions gamutrf/grscan.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
import os
import glob
import logging
import sys
from pathlib import Path
import pbr.version
import webcolors

try:
Expand Down Expand Up @@ -123,6 +126,12 @@ def __init__(
##################################################
# Blocks
##################################################
if iqtlabs is not None:
griqtlabs_path = os.path.realpath(
glob.glob("/usr/local/**/libgnuradio-iqtlabs.so", recursive=True)[0]
)
pbr_version = pbr.version.VersionInfo("gamutrf").version_string()
logging.info(f"gamutrf {pbr_version} with gr-iqtlabs {griqtlabs_path}")

logging.info(f"will scan from {freq_start} to {freq_end}")
freq_range = freq_end - freq_start
Expand Down
Loading

0 comments on commit 43f03da

Please sign in to comment.