Skip to content

Read noise #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dlagattuta wants to merge 28 commits into
base: main
Choose a base branch
from
Open

Read noise #39

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5b8ed68
updating readNoise class
dlagattuta Nov 2, 2022
49c1f37
Merge pull request #38 from dlagattuta/readNoise
dlagattuta Nov 2, 2022
fd5c2da
Update read_noise.py
dlagattuta Nov 7, 2022
c3a4e24
Update .gitignore
dlagattuta Nov 7, 2022
96778e7
Update read_noise.py
dlagattuta Nov 7, 2022
ca592fd
Update read_noise.py
dlagattuta Nov 7, 2022
f366443
Update read_noise.py
dlagattuta Dec 8, 2022
a300a68
updated readme
rjmassey Jan 24, 2023
169cedd
Update read_noise.py
dlagattuta Jan 24, 2023
c04513e
Merge branch 'readNoise' of https://github.com/jkeger/arctic into rea…
dlagattuta Jan 24, 2023
6a42b8b
Update read_noise.py
dlagattuta Jan 24, 2023
e447034
comments added
rjmassey Jan 24, 2023
f9c3ec6
update read_noise.py
dlagattuta Jan 31, 2023
a8ce2dd
Update read_noise.py
dlagattuta Feb 1, 2023
38cee6d
Update read_noise.py
dlagattuta Feb 13, 2023
feb4572
Update read_noise.py
dlagattuta Feb 15, 2023
92d8aaf
Update read_noise.py
dlagattuta Feb 15, 2023
38d0aa8
Update read_noise.py
dlagattuta Feb 15, 2023
d867f99
updated read_noise.py and test_arcticpy.py
dlagattuta Mar 6, 2023
dc67000
Update test_arcticpy.py
dlagattuta Mar 6, 2023
2948bae
Update test_arcticpy.py
dlagattuta Mar 6, 2023
588c0ba
Update read_noise.py
dlagattuta Mar 6, 2023
a410659
speed ups for noise treatment
Mar 9, 2023
bea2521
some type hints; further fixes
Mar 9, 2023
f1aa23b
fixed typo
Mar 10, 2023
f41fabf
added new c implementation; updated setup.py
Mar 10, 2023
0db1946
fix to setup.py (g++ does not work for read_noise extension)
Mar 10, 2023
e8e2c09
Merge pull request #43 from jkeger/fix/readNoise
dlagattuta Mar 10, 2023
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
12 changes: 6 additions & 6 deletions makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ DIR_INC := $(DIR_ROOT)/include
DIR_TEST := $(DIR_ROOT)/test
#DIR_GSL ?= /cosma/local/gsl/2.5/lib
#DIR_OMP ?= /cosma/local/openmpi/gnu_11.1.0/4.1.4/lib
#DIR_GSL ?= $(DIR_HOMEBREW)
#DIR_OMP ?= $(DIR_HOMEBREW)
DIR_GSL ?= $(DIR_HOMEBREW)
DIR_OMP ?= $(DIR_HOMEBREW)
#DIR_OMP ?= $(DIR_MACPORTS)/libomp
DIR_OMP ?= $(DIR_MACPORTS)
DIR_GSL ?= $(DIR_MACPORTS)
#DIR_OMP ?= $(DIR_MACPORTS)
#DIR_GSL ?= $(DIR_MACPORTS)
# Fallback self-installing GSL
#DIR_GSL ?= $(DIR_ROOT)/gsl
DIR_WRAPPER := $(DIR_ROOT)/python/arcticpy
Expand Down Expand Up @@ -99,9 +99,9 @@ LIBARCTIC := -L $(DIR_ROOT) -Wl,-rpath,$(DIR_ROOT) -l$(TARGET)
# Add multithreading to reduce runtime (requires OpenMP to have been installed)
CXXFLAGS += -Xpreprocessor -fopenmp
# Use this on a mac
# LIBS += -L $(DIR_OMP)/lib -lomp
LIBS += -L $(DIR_OMP)/lib -lomp
Copy link
Copy Markdown
Collaborator

@Jammy2211 Jammy2211 Nov 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to stop swapping these out depending on whether the last PR was someone using Mac or Linux lol

# Use the following on cosma (can also use with macports)
LIBS += -L $(DIR_OMP)/lib -lgomp
#LIBS += -L $(DIR_OMP)/lib -lgomp



Expand Down
Loading