Skip to content

Merge OpenMP branch to master #8

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
macrocosme wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Merge OpenMP branch to master #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2133256
Functional omp version with timing output for test
macrocosme Dec 7, 2020
ad61447
Add threads and omp
macrocosme Dec 7, 2020
ee6dcda
Adding ifdefs _OPENMP
macrocosme Jan 11, 2021
9ddd06b
Adding ifdefs _OPENMP to includes
macrocosme Jan 11, 2021
c5e1dfa
Merge latest changes from master
macrocosme Jan 13, 2021
8f5d60b
Merge latest from master
macrocosme Feb 9, 2021
48b9f92
Fix double pointer, missing bracket, timing print
macrocosme Feb 17, 2021
602f65e
Add missing thread_num as omp private
macrocosme Mar 31, 2021
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ BINDIR=bin
MYBIN=/home/maan/pulsar_softwares/bin/

CC=gcc
CFLAGS=-I$(IDIR) -Wno-unused-result -O3 -march=native
LIBS=-lm -lfftw3 -lcpgplot
CFLAGS=-I$(IDIR) -Wno-unused-result -O3 -march=native -fopenmp
LIBS=-lm -lfftw3_threads -lfftw3 -lcpgplot

_DEPS = header.h rficlean.h version.h
DEPS = $(patsubst %,$(IDIR)/%,$(_DEPS))
Expand Down
10 changes: 5 additions & 5 deletions include/rficlean.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ long byte_offset;
int headerless,obits,iflip,nred, iwhite,nints,nsub,maxhist,numhist,nsubchans,tnorm,fnorm,igetstat,nharm,pcl,nsect,zerodm,bl_start,nblocks;
char inpfile[128], outfile[128], gminfofile[128],gmhdrfile[128],psfile[100];
FILE *input, *output, *gminfo, *gmhdr;
double tempra,tempdec, psrf, psrfdf, *last_mspec, *wrms, *wmean, *ai;
double tempra,tempdec, psrf, psrfdf, *last_mspec, **wrms, **wmean, **ai;
float forcefthresh,fthresh,rthresh,sthresh,last_tvar,last_fvar,chanfrac,sampfrac,clipthresh;
float *fftstat, *chanstat, *predist, *xpredist, *postdist, *xpostdist, *finaldist, *xfinaldist ;
double *tfvar, *tfmean,meanvar,rmsvar ;
double *chandata, *mspec, *rspec, *vspec, *wspec, *wt;
double **chandata, *mspec, *rspec, *vspec, *wspec, *wt;
long int *coff;
bool RFIx,rfiFDx,rfiTx,rfiSx,rfiMSx,rfiVSx,rfiSclip;

fftw_complex *in;
fftw_complex *out;
fftw_plan fplan, bplan;
fftw_complex **in;
fftw_complex **out;
fftw_plan *fplan, *bplan;


int strings_equal (char *string1, char *string2);
Expand Down
Loading