Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CosmoStat/Sparse2D
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.1.1
Choose a base ref
...
head repository: CosmoStat/Sparse2D
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Dec 19, 2018

  1. updated readme

    sfarrens authored Dec 19, 2018
    Copy the full SHA
    2f7b249 View commit details

Commits on Mar 11, 2019

  1. Copy the full SHA
    1c0857e View commit details
  2. Run Travis on OS X

    giordano committed Mar 11, 2019
    Copy the full SHA
    eebead0 View commit details

Commits on Mar 13, 2019

  1. Fix errors reported by Clang

    Use `float` literals to initialise `float` arrays.
    giordano committed Mar 13, 2019
    Copy the full SHA
    15f5bd5 View commit details
  2. Copy the full SHA
    4df7a2d View commit details

Commits on Mar 15, 2019

  1. Merge pull request #19 from giordano/no-values

    Do not include unused header file
    sfarrens authored Mar 15, 2019
    Copy the full SHA
    ee8bd62 View commit details
  2. Copy the full SHA
    088e03d View commit details
  3. Merge pull request #21 from giordano/clang

    Fix errors reported by Clang
    sfarrens authored Mar 15, 2019
    Copy the full SHA
    a420613 View commit details
  4. Copy the full SHA
    70ba149 View commit details
  5. Add support for AppleClang

    giordano committed Mar 15, 2019
    Copy the full SHA
    cd6737d View commit details
  6. Merge pull request #20 from giordano/travis-osx

    Run Travis on OS X
    sfarrens authored Mar 15, 2019
    Copy the full SHA
    e09fca4 View commit details
  7. Update VERSION

    sfarrens authored Mar 15, 2019
    Copy the full SHA
    af67786 View commit details

Commits on Mar 27, 2019

  1. Do not set MACOS on macOS

    giordano committed Mar 27, 2019
    Copy the full SHA
    83d0eed View commit details

Commits on Mar 28, 2019

  1. Copy the full SHA
    e66d4e1 View commit details
  2. Updated OpenMP instructions

    sfarrens committed Mar 28, 2019
    Copy the full SHA
    b679b44 View commit details
  3. Merge pull request #22 from giordano/no-macos-macro

    Do not set `MACOS` on macOS
    sfarrens authored Mar 28, 2019
    Copy the full SHA
    eacbc12 View commit details
  4. add latest changes

    sfarrens committed Mar 28, 2019
    Copy the full SHA
    739c9c7 View commit details
  5. Copy the full SHA
    47279d4 View commit details
  6. Merge pull request #24 from sfarrens/optional_tests

    macOS Updates
    sfarrens authored Mar 28, 2019
    Copy the full SHA
    23ed797 View commit details
  7. openmp bug fix and clean up

    sfarrens committed Mar 28, 2019
    Copy the full SHA
    674e79f View commit details
  8. Merge pull request #25 from sfarrens/openmp_bug

    openmp bug fix and clean up
    sfarrens authored Mar 28, 2019
    Copy the full SHA
    d9b8063 View commit details

Commits on Mar 29, 2019

  1. added bug fix for openmp

    sfarrens committed Mar 29, 2019
    Copy the full SHA
    4f1b4f0 View commit details
  2. Merge pull request #26 from sfarrens/openmp_bugfix2

    added bug fix for openmp
    sfarrens authored Mar 29, 2019
    Copy the full SHA
    11044ce View commit details

Commits on Jul 4, 2019

  1. added mr1d files

    sfarrens committed Jul 4, 2019
    Copy the full SHA
    f717c22 View commit details

Commits on Jul 5, 2019

  1. updated macOS travis set up

    sfarrens committed Jul 5, 2019
    Copy the full SHA
    451952b View commit details
  2. disabled tests

    sfarrens committed Jul 5, 2019
    Copy the full SHA
    4cf8007 View commit details
  3. fixed bug

    sfarrens committed Jul 5, 2019
    Copy the full SHA
    9d2915c View commit details

Commits on Jul 8, 2019

  1. test Clang fix

    sfarrens committed Jul 8, 2019
    Copy the full SHA
    2bc002d View commit details
  2. bug fix

    sfarrens committed Jul 8, 2019
    Copy the full SHA
    f77746d View commit details
  3. Copy the full SHA
    484256a View commit details
  4. Merge pull request #27 from sfarrens/mr1d

    mr1d
    sfarrens authored Jul 8, 2019
    Copy the full SHA
    d4d218b View commit details

Commits on Apr 1, 2020

  1. updated fftw version

    sfarrens committed Apr 1, 2020
    Copy the full SHA
    4543c27 View commit details
  2. updated travis

    sfarrens committed Apr 1, 2020
    Copy the full SHA
    4e593d7 View commit details
  3. Merge pull request #32 from sfarrens/update_fftw

    updated fftw version
    sfarrens authored Apr 1, 2020
    Copy the full SHA
    b977d3c View commit details

Commits on Apr 25, 2020

  1. add im_isospec

    jstarck committed Apr 25, 2020
    Copy the full SHA
    156b986 View commit details
  2. add GMCA in the repositoty

    jstarck committed Apr 25, 2020
    Copy the full SHA
    02f6c8b View commit details

Commits on May 3, 2020

  1. add svd in MatrixOper

    jstarck committed May 3, 2020
    Copy the full SHA
    93f334a View commit details
  2. svd was missing

    jstarck committed May 3, 2020
    Copy the full SHA
    3e3a6c6 View commit details

Commits on Aug 28, 2020

  1. Bigmac version (#3)

    * set macOS FFTW flags
    
    * updated
    
    * test
    
    * updated
    
    * fixed gitignore bug
    
    * updated flags
    
    * added NFFT fix
    
    * updated fftw and nfft builds
    
    * updated travis
    
    * added Dockerfile and updated readme
    
    * updated dockerfile
    
    * added build for mr2d1d_stat
    
    * cleaned up CMakeLists
    
    * changed lib order
    
    * updated .gitignore
    
    * added nfft fix for linux
    
    * updated travis and cleaned up
    sfarrens authored Aug 28, 2020
    Copy the full SHA
    264d7cd View commit details

Commits on Aug 31, 2020

  1. Bigmac version (#4)

    * set macOS FFTW flags
    
    * updated
    
    * test
    
    * updated
    
    * fixed gitignore bug
    
    * updated flags
    
    * added NFFT fix
    
    * updated fftw and nfft builds
    
    * updated travis
    
    * added Dockerfile and updated readme
    
    * updated dockerfile
    
    * added build for mr2d1d_stat
    
    * cleaned up CMakeLists
    
    * changed lib order
    
    * updated .gitignore
    
    * added nfft fix for linux
    
    * updated travis and cleaned up
    
    * added new libraries
    
    * linux fix
    sfarrens authored Aug 31, 2020
    Copy the full SHA
    d2ea370 View commit details

Commits on Sep 9, 2020

  1. Bigmac version (#5)

    * set macOS FFTW flags
    
    * updated
    
    * test
    
    * updated
    
    * fixed gitignore bug
    
    * updated flags
    
    * added NFFT fix
    
    * updated fftw and nfft builds
    
    * updated travis
    
    * added Dockerfile and updated readme
    
    * updated dockerfile
    
    * added build for mr2d1d_stat
    
    * cleaned up CMakeLists
    
    * changed lib order
    
    * updated .gitignore
    
    * added nfft fix for linux
    
    * updated travis and cleaned up
    
    * added new libraries
    
    * linux fix
    
    * updated fftw build instructions
    
    * readded missing FFTW flag
    
    * updated travis
    sfarrens authored Sep 9, 2020
    Copy the full SHA
    d2bc3e4 View commit details

Commits on Sep 14, 2020

  1. BigMac support for AppleClang (#33)

    * set macOS FFTW flags
    * fixed gitignore bug
    * added NFFT fix
    * updated fftw and nfft builds
    * updated travis
    * added Dockerfile and updated readme
    * added build for mr2d1d_stat
    * cleaned up CMakeLists
    * changed lib order
    * updated .gitignore
    * added nfft fix for linux
    * set macOS FFTW flags
    * added build for mr2d1d_stat
    * added new libraries
    * updated fftw build instructions
    * resolved issue with FFTW headers
    * fixed library def
    sfarrens authored Sep 14, 2020
    Copy the full SHA
    f9e8952 View commit details
  2. Copy the full SHA
    5d14ac3 View commit details

Commits on Mar 7, 2021

  1. Copy the full SHA
    d165d8f View commit details

Commits on Dec 9, 2021

  1. Copy the full SHA
    4aebec9 View commit details

Commits on Jan 7, 2022

  1. Copy the full SHA
    5fffa12 View commit details

Commits on Jan 18, 2022

  1. Copy the full SHA
    9308578 View commit details

Commits on Jan 19, 2022

  1. test with message

    sfarrens committed Jan 19, 2022
    Copy the full SHA
    3459fd0 View commit details
  2. Copy the full SHA
    df47014 View commit details

Commits on Jan 21, 2022

  1. added C++14 flag

    sfarrens committed Jan 21, 2022
    Copy the full SHA
    b6bcb84 View commit details
Showing 881 changed files with 251,444 additions and 13,181 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.dockerignore
Dockerfile
130 changes: 130 additions & 0 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
name: CI

on:
pull_request:
branches:
- develop
- master
- main

jobs:
test-full:
name: Basic Test Suite
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os: [macos-latest, ubuntu-latest]
python-version: ["3.10"]

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Check Python Version
run: python --version

- name: Install macOS Dependencies
if: runner.os == 'macOS'
run: |
brew tap sfarrens/sf
brew install bigmac
brew install catch2 cfitsio fftw libomp armadillo gsl healpix
- name: Install Linux Dependencies
if: runner.os == 'Linux'
run: |
sudo apt-get update
sudo apt-get install -y libcfitsio-dev
sudo apt-get install -y libfftw3-dev
sudo apt-get install -y libarmadillo-dev
sudo apt-get install -y libgsl-dev
sudo apt-get install -y libsharp-dev
sudo apt-get install -y libhealpix-cxx-dev
sudo apt-get install -y healpy-data
wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.1.0.tar.gz
tar -xvf v3.1.0.tar.gz
cd Catch2-3.1.0
cmake -Bbuild -H. -DBUILD_TESTING=OFF
sudo cmake --build build/ --target install
cd
- name: Compile Sparse2D Binaries
run: |
mkdir build
cd build
cmake .. --log-level=VERBOSE
make -j 4
- name: Run Unit Tests
run: |
cd build
make test
- name: Archive Unit Test Log
uses: actions/upload-artifact@v4
with:
name: test-log-${{ matrix.os }}
retention-days: 14
path: |
build/Testing/Temporary/LastTest.log
test-pysap:
name: PySAP Compatibility Test
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
python-version: ["3.10"]

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Check Python Version
run: python --version

- name: Install Linux Dependencies
run: |
sudo apt-get update
sudo apt-get install -y libcfitsio-dev
sudo apt-get install -y python3
sudo apt-get install -y python3-pip
wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.1.0.tar.gz
tar -xvf v3.1.0.tar.gz
cd Catch2-3.1.0
cmake -Bbuild -H. -DBUILD_TESTING=OFF
sudo cmake --build build/ --target install
cd
- name: Compile Sparse2D Binaries
run: |
mkdir build
cd build
cmake .. --log-level=VERBOSE -DONLY_SPARSE=ON -DUSE_FFTW=OFF -DBUILD_CFITSIO=ON
make -j 4
- name: Run Unit Tests
run: |
cd build
make test
- name: Archive Unit Test Log
uses: actions/upload-artifact@v4
with:
name: test-log-pysap
retention-days: 14
path: |
build/Testing/Temporary/LastTest.log
41 changes: 41 additions & 0 deletions .github/workflows/deploy-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Create and publish a Docker image

on:
push:
branches: ['master']

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:
build-and-push-image:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
37 changes: 35 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,35 @@
# Ignore build files
build/
# Prerequisites
*.d

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

# Ignore build directory
build
30 changes: 0 additions & 30 deletions .travis.yml

This file was deleted.

Loading