diff --git a/Artifacts.toml b/Artifacts.toml index f5b4b0e..7b5c02c 100644 --- a/Artifacts.toml +++ b/Artifacts.toml @@ -1,19 +1,19 @@ [[pp_lib]] arch = "x86_64" os = "linux" -git-tree-sha1 = "368835caf6eb5017e11c2181aec8c46452d44441" +git-tree-sha1 = "3d5b880c83373c8d9d91e3ee3a57b49d67d15b73" lazy = true [[pp_lib.download]] - sha256 = "d0c5124ba78beb35706dc44e8747a88731e5f9e91da70dbd2837300b26dcebfd" + sha256 = "4e642e478f9f2ae485a287ebf01f3ba0af135545a17a567dea5bff5930a697cc" #url = "file:///home/john/work/julia/pp_lib.tar.gz" url = "https://raw.githubusercontent.com/spm/PushPull.jl/main/artifacts/pp_lib.tar.gz" [[pp_lib]] arch = "x86_64" os = "windows" -git-tree-sha1 = "7c43d07a531ec2432ca5673f96cb037d7e16b6c9" +git-tree-sha1 = "3d5b880c83373c8d9d91e3ee3a57b49d67d15b73" lazy = true [[pp_lib.download]] - sha256 = "d0c5124ba78beb35706dc44e8747a88731e5f9e91da70dbd2837300b26dcebfd" + sha256 = "4e642e478f9f2ae485a287ebf01f3ba0af135545a17a567dea5bff5930a697cc" url = "https://raw.githubusercontent.com/spm/PushPull.jl/main/artifacts/pp_lib.tar.gz" diff --git a/artifacts/C/Makefile b/artifacts/C/Makefile index dc92215..e8b860d 100644 --- a/artifacts/C/Makefile +++ b/artifacts/C/Makefile @@ -3,8 +3,8 @@ include Makefile.var #PTXFILES = pushpull.ptx lbessi.ptx operator.ptx shootfun.ptx TVdenoise3d.ptx TVdenoise2d.ptx TVdenoise2d_old.ptx PTXFILES = pushpull.ptx lbessi.ptx sparse_operator.ptx TVdenoise3d.ptx TVdenoise2d.ptx blip.ptx -LIBFILES = pushpull.$(SOSUF) TVdenoise3d.$(SOSUF) sparse_operator.$(SOSUF) - +LIBFILES = pushpull.$(SOSUF) TVdenoise3d.$(SOSUF) sparse_operator.$(SOSUF) blip.$(SOSUF) +PPLIB = ../pp_lib.tar.gz #CC = x86_64-w64-mingw32-gcc-win32 all: $(PTXFILES) $(LIBFILES) @@ -12,6 +12,8 @@ all: $(PTXFILES) $(LIBFILES) install: all $(PTXDIR) $(LIBDIR) $(COPY) $(PTXFILES) $(PTXDIR) $(COPY) $(LIBFILES) $(LIBDIR) + tar -C .. -cvf - lib | gzip -v > $(PPLIB) + julia get_sha.jl $(PPLIB) clean: $(DEL) $(PTXFILES) $(LIBFILES) @@ -20,9 +22,6 @@ pushpull.$EXT : pushpull.c pushpull_dev.cu blip.ptx: blip.cu blip_dev.cu -noise: - echo $(LIBDIR) - #pushpull.$EXT : pushpull.c pushpull_dev.cu # $(CC) -Wall -fPIC -O3 -c pushpull.c @@ -44,7 +43,6 @@ noise: # $(CC) -shared -Wl,-soname,TVdenoise3.so -o TVdenoise3.so TVdenoise3.o %.so : %.c - echo $(PLATFORM) $(CC) -O4 -shared -fPIC -Wl,-soname,$@ -o $@ -lm $< %.dll : %.c @@ -54,7 +52,6 @@ noise: # gcc -O4 -shared -fPIC -Wl,-soname,$@ -o $@ -lm $< %.ptx : %.cu - echo $(PLATFORM) $(NVCC) -ptx --ptxas-options --verbose -O3 $< $(PTXDIR) : diff --git a/artifacts/C/blip.c b/artifacts/C/blip.c new file mode 100644 index 0000000..a1b6bd4 --- /dev/null +++ b/artifacts/C/blip.c @@ -0,0 +1,90 @@ +#include "cuheader.h" +#include "blip_dev.cu" + +#define min(a,b) ((a)<(b) ? (a) : (b)) +#define max(a,b) ((a)>(b) ? (a) : (b)) + + +void blip_pad(const USIZE_t i_start, const USIZE_t j_start, const USIZE_t k_start, + const USIZE_t i_stop, const USIZE_t j_stop, const USIZE_t k_stop, + float *u, const USIZE_t *d, const float *g, + const float *aa, const float *bb, const float *ab, + const float *s) +{ + USIZE_t i0, j0, k0; + for(k0=k_start; k0=1 + filename = ARGS[1] +end +sha1 = Tar.tree_hash(IOBuffer(inflate_gzip(filename))) +sha2 = bytes2hex(open(sha256, filename)) +println("Edit the Artifacts.toml using the following:\n") +println("git-tree-sha1 = \"", sha1, "\""); +println(" sha256 = \"", sha2, "\""); + +println("\nor run the following (in Unix):") +artif = "../../Artifacts.toml" +println("\ncp ", artif, " Artifacts.prev ; sed < Artifacts.prev '/git-tree-sha1/s/\"[0-9,a-c].*\"/\"", sha1,"\"/' | sed '/sha256/s/\"[0-9,a-c].*\"/\"",sha2,"\"/' > ", artif, "\n") + diff --git a/artifacts/pp_lib.tar.gz b/artifacts/pp_lib.tar.gz index 6fd7e8b..c49b7a6 100644 Binary files a/artifacts/pp_lib.tar.gz and b/artifacts/pp_lib.tar.gz differ