Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ on:

jobs:
call-changelog-check-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.20.0
uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.22.1
permissions:
contents: read
4 changes: 3 additions & 1 deletion .github/workflows/create-jira-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ on:

jobs:
call-create-jira-issue-workflow:
uses: ASFHyP3/actions/.github/workflows/reusable-create-jira-issue.yml@v0.20.0
uses: ASFHyP3/actions/.github/workflows/reusable-create-jira-issue.yml@v0.22.1
permissions:
issues: write
secrets:
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/labeled-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ on:
jobs:
call-labeled-pr-check-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.20.0
uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.22.1
permissions:
pull-requests: read
2 changes: 1 addition & 1 deletion .github/workflows/release-checklist-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
call-release-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-release-checklist-comment.yml@v0.20.0
uses: ASFHyP3/actions/.github/workflows/reusable-release-checklist-comment.yml@v0.22.1
permissions:
pull-requests: write
secrets:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ on:

jobs:
call-release-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.20.0
uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.22.1
permissions: {}
with:
release_prefix: SRG
release_branch: main
develop_branch: develop
sync_pr_label: bumpless
secrets:
USER_TOKEN: ${{ secrets.TOOLS_BOT_PAK }}
18 changes: 17 additions & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,20 @@ on: push
jobs:
call-secrets-analysis-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.20.0
uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.22.1
permissions:
contents: read

call-ruff-workflow:
uses: ASFHyP3/actions/.github/workflows/reusable-ruff.yml@v0.22.1
permissions:
contents: read
with:
runner: ubuntu-latest

call-mypy-workflow:
uses: ASFHyP3/actions/.github/workflows/reusable-mypy.yml@v0.22.1
permissions:
contents: read
with:
runner: ubuntu-latest
3 changes: 2 additions & 1 deletion .github/workflows/tag-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
jobs:
call-bump-version-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.20.0
uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.22.1
permissions: {}
with:
user: tools-bot
email: UAF-asf-apd@alaska.edu
Expand Down
48 changes: 48 additions & 0 deletions .github/workflows/test-and-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Test and build

on:
push:
branches:
- develop
tags:
- 'v*'
pull_request:
branches:
- main
- develop

jobs:
call-pytest-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-pytest.yml@v0.22.1
permissions:
contents: read
with:
local_package_name: srg
python_versions: >-
["3.10", "3.11", "3.12", "3.13"]

call-version-info-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.22.1
permissions:
contents: read
with:
python_version: "3.12"

call-docker-ghcr-workflow:
needs: call-version-info-workflow
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-docker-ghcr.yml@v0.22.1
permissions:
contents: read
packages: write
with:
version_tag: ${{ needs.call-version-info-workflow.outputs.version_tag }}
user: tools-bot
file: Dockerfile.gpu
provenance: true
platforms: ''
build_args: ''
secrets:
USER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/)
and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.5.0]
### Added
- `hyp3-srg` [v0.10.3](https://github.com/ASFHyP3/hyp3-srg/blob/develop/CHANGELOG.md#0103) has been merged into SRG. `srg` now provides these additional entrypoints:
* `back_projection` provides GSLC back-projection processing
* `time_series` process Sentinel-1 GSLC time series.

Comment thread
mfangaritav marked this conversation as resolved.
Resolved
## [0.4.3]
### Fixed
- made the auxiliary script for PS processing executable.
Expand Down
60 changes: 60 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
FROM condaforge/mambaforge:latest as builder

ENV USEGPU=false
ENV FFTW_LIB=/usr/lib/x86_64-linux-gnu/libfftw3f.a
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get install -y --no-install-recommends unzip vim curl git build-essential gfortran libfftw3-dev && \
apt-get clean && rm -rf /var/lib/apt/lists/*

COPY . /srg/
COPY ./scripts/build_proc.sh /srg/
RUN chmod +x /srg/build_proc.sh
RUN cd /srg && ./build_proc.sh && cd /

FROM condaforge/mambaforge:latest as runner

# For opencontainers label definitions, see:
# https://github.com/opencontainers/image-spec/blob/master/annotations.md
LABEL org.opencontainers.image.title="HyP3 SRG"
LABEL org.opencontainers.image.description="HyP3 plugin for Stanford Radar Group SAR processing"
LABEL org.opencontainers.image.vendor="Alaska Satellite Facility"
LABEL org.opencontainers.image.authors="ASF Tools Team <UAF-asf-apd@alaska.edu>"
LABEL org.opencontainers.image.licenses="BSD-3-Clause"
LABEL org.opencontainers.image.url="https://github.com/ASFHyP3/srg"
LABEL org.opencontainers.image.source="https://github.com/ASFHyP3/srg"
LABEL org.opencontainers.image.documentation="https://hyp3-docs.asf.alaska.edu"

ARG CONDA_UID=1000
ARG CONDA_GID=1000

ENV PYTHONDONTWRITEBYTECODE=true
ENV MYHOME=/home/conda
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get install -y --no-install-recommends unzip vim curl gfortran && \
apt-get clean && rm -rf /var/lib/apt/lists/*

RUN groupadd -g "${CONDA_GID}" --system conda && \
useradd -l -u "${CONDA_UID}" -g "${CONDA_GID}" --system -d /home/conda -m -s /bin/bash conda && \
chown -R conda:conda /opt && \
echo ". /opt/conda/etc/profile.d/conda.sh" >> /home/conda/.profile && \
echo "conda activate base" >> /home/conda/.profile

SHELL ["/bin/bash", "-l", "-c"]

USER ${CONDA_UID}
WORKDIR /home/conda/


COPY --chown=${CONDA_UID}:${CONDA_GID} --from=builder /srg/snaphu_v2.0b0.0.0/bin/snaphu /srg/bin/snaphu
COPY --chown=${CONDA_UID}:${CONDA_GID} --from=builder /srg /srg

RUN mamba env create -f /srg/environment.yml && \
conda clean -afy && \
conda activate srg && \
sed -i 's/conda activate base/conda activate srg/g' /home/conda/.profile && \
python -m pip install --no-cache-dir /srg

ENTRYPOINT ["/srg/src/srg/etc/entrypoint.sh"]
CMD ["-h"]
82 changes: 82 additions & 0 deletions Dockerfile.gpu
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
FROM nvidia/cuda:12.4.1-devel-ubuntu22.04 AS builder

# FIXME: should be able to find this dynamically
ARG GPU_ARCH=89

# GPU_ARCH and USEGPU environment variable used by build_proc.sh
ENV FFTW_LIB=/usr/lib/x86_64-linux-gnu/libfftw3f.a
ENV GPU_ARCH=${GPU_ARCH}
ENV USEGPU=true
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get install -y --no-install-recommends unzip vim curl git build-essential gfortran libfftw3-dev && \
apt-get clean && rm -rf /var/lib/apt/lists/*

COPY . /srg/
COPY ./scripts/build_proc.sh /srg/
RUN chmod +x /srg/build_proc.sh
RUN cd /srg && ./build_proc.sh && cd /

FROM nvidia/cuda:12.4.1-runtime-ubuntu22.04 AS runner

# For opencontainers label definitions, see:
# https://github.com/opencontainers/image-spec/blob/master/annotations.md
LABEL org.opencontainers.image.title="SRG"
LABEL org.opencontainers.image.description="HyP3 plugin for Stanford Radar Group Processor SAR processing"
LABEL org.opencontainers.image.vendor="Alaska Satellite Facility"
LABEL org.opencontainers.image.authors="ASF Tools Team <UAF-asf-apd@alaska.edu>"
LABEL org.opencontainers.image.licenses="BSD-3-Clause"
LABEL org.opencontainers.image.url="https://github.com/ASFHyP3/srg"
LABEL org.opencontainers.image.source="https://github.com/ASFHyP3/srg"
LABEL org.opencontainers.image.documentation="https://hyp3-docs.asf.alaska.edu"

ARG CONDA_UID=1000
ARG CONDA_GID=1000
ARG MINIFORGE_NAME=Miniforge3
ARG MINIFORGE_VERSION=24.3.0-0

ENV CONDA_DIR=/opt/conda
ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
ENV PATH=${CONDA_DIR}/bin:${PATH}
ENV PYTHONDONTWRITEBYTECODE=true
ENV PROC_HOME=/srg
ENV MYHOME=/home/conda
ENV DEBIAN_FRONTEND=noninteractive

# Conda setup
RUN apt-get update && apt-get install --no-install-recommends --yes wget bzip2 ca-certificates git > /dev/null && \
wget --no-hsts --quiet https://github.com/conda-forge/miniforge/releases/download/${MINIFORGE_VERSION}/${MINIFORGE_NAME}-${MINIFORGE_VERSION}-Linux-$(uname -m).sh -O /tmp/miniforge.sh && \
/bin/bash /tmp/miniforge.sh -b -p ${CONDA_DIR} && \
rm /tmp/miniforge.sh && \
conda clean --tarballs --index-cache --packages --yes && \
find ${CONDA_DIR} -follow -type f -name '*.a' -delete && \
find ${CONDA_DIR} -follow -type f -name '*.pyc' -delete && \
conda clean --force-pkgs-dirs --all --yes && \
echo ". ${CONDA_DIR}/etc/profile.d/conda.sh && conda activate base" >> /etc/skel/.bashrc && \
echo ". ${CONDA_DIR}/etc/profile.d/conda.sh && conda activate base" >> ~/.bashrc

RUN apt-get install -y --no-install-recommends unzip vim curl gfortran && \
apt-get clean && rm -rf /var/lib/apt/lists/*

RUN groupadd -g "${CONDA_GID}" --system conda && \
useradd -l -u "${CONDA_UID}" -g "${CONDA_GID}" --system -d /home/conda -m -s /bin/bash conda && \
chown -R conda:conda /opt && \
echo ". /opt/conda/etc/profile.d/conda.sh" >> /home/conda/.profile && \
echo "conda activate base" >> /home/conda/.profile

SHELL ["/bin/bash", "-l", "-c"]

USER ${CONDA_UID}
WORKDIR /home/conda/

COPY --chown=${CONDA_UID}:${CONDA_GID} --from=builder /srg/snaphu_v2.0b0.0.0/bin/snaphu /srg/bin/snaphu
COPY --chown=${CONDA_UID}:${CONDA_GID} --from=builder /srg /srg

RUN mamba env create -f /srg/environment.yml && \
conda clean -afy && \
conda activate srg && \
sed -i 's/conda activate base/conda activate srg/g' /home/conda/.profile && \
python -m pip install --no-cache-dir /srg

ENTRYPOINT ["/srg/src/srg/etc/entrypoint.sh"]
CMD ["-h"]
Loading
Loading