Update makefiles and fix a few inconsistencies

sede-open · Jul 25, 2022 · 6c46dcc · 6c46dcc
1 parent 05b3f4c
commit 6c46dcc
Show file tree

Hide file tree

Showing 18 changed files with 47 additions and 38 deletions.
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ all:
 	@echo $(LIBRARY)
 	@cd src; $(MAKE) clean $(LIBRARY)
 ifneq ($(BUILD_CFP),0)
-	@cd cfp/src; $(MAKE) clean $(LIBRARY)
+	@cd cfp; $(MAKE) clean $(LIBRARY)
 endif
 ifneq ($(BUILD_ZFORP),0)
 	@cd fortran; $(MAKE) clean $(LIBRARY)
@@ -33,7 +33,7 @@ test:
 # clean all
 clean:
 	@cd src; $(MAKE) clean
-	@cd cfp/src; $(MAKE) clean
+	@cd src; $(MAKE) clean
 	@cd fortran; $(MAKE) clean
 	@cd utils; $(MAKE) clean
 	@cd tests; $(MAKE) clean

diff --git a/cfp/Makefile b/cfp/Makefile
@@ -1,9 +1,9 @@
-include ../../Config
+include ../Config
 
-LIBDIR = ../../lib
+LIBDIR = ../lib
 TARGETS = $(LIBDIR)/libcfp.a $(LIBDIR)/libcfp.so
-OBJECTS = cfparray.o
-INCS = -I../include -I../../include -I../../array -I../../src
+OBJECTS = cfp.o
+INCS = -I../include -I../src
 
 static: $(LIBDIR)/libcfp.a
 

diff --git a/examples/Makefile b/examples/Makefile
@@ -16,29 +16,36 @@ CXXLIBS = $(LIBS)
 
 # add cfp examples when BUILD_CFP is enabled
 ifneq ($(BUILD_CFP),0)
-  TARGETS += $(BINDIR)/diffusionC
+  TARGETS += $(BINDIR)/diffusionC\
+			 $(BINDIR)/iteratorC
 endif
 
 
 all: $(TARGETS)
 
 $(BINDIR)/array: array.cpp ../lib/$(LIBZFP)
-	$(CXX) $(CXXFLAGS) $(INCS) -I../array array.cpp $(CXXLIBS) -o $@
+	$(CXX) $(CXXFLAGS) $(INCS) array.cpp $(CXXLIBS) -o $@
 
 $(BINDIR)/diffusion: diffusion.cpp ../lib/$(LIBZFP)
-	$(CXX) $(CXXFLAGS) $(INCS) -I../array diffusion.cpp $(CXXLIBS) -o $@
+	$(CXX) $(CXXFLAGS) $(INCS) diffusion.cpp $(CXXLIBS) -o $@
 
 $(BINDIR)/diffusionC: diffusionC.o ../lib/$(LIBZFP) ../lib/$(LIBCFP)
 	$(CXX) $(CXXFLAGS) diffusionC.o -lcfp $(CLIBS) -o $@
 
 diffusionC.o: diffusionC.c
-	$(CC) $(CFLAGS) $(INCS) -I../cfp/include -c diffusionC.c
+	$(CC) $(CFLAGS) $(INCS) -c diffusionC.c
 
 $(BINDIR)/inplace: inplace.c ../lib/$(LIBZFP)
 	$(CC) $(CFLAGS) $(INCS) inplace.c $(CLIBS) -o $@
 
 $(BINDIR)/iterator: iterator.cpp ../lib/$(LIBZFP)
-	$(CXX) $(CXXFLAGS) $(INCS) -I../array iterator.cpp $(CXXLIBS) -o $@
+	$(CXX) $(CXXFLAGS) $(INCS) iterator.cpp $(CXXLIBS) -o $@
+
+$(BINDIR)/iteratorC: iteratorC.o ../lib/$(LIBZFP) ../lib/$(LIBCFP)
+	$(CXX) $(CXXFLAGS) iteratorC.o -lcfp $(CLIBS) -o $@
+
+itertorC.o: iteratorC.c
+	$(CC) $(CFLAGS) $(INCS) -c itertorC.c
 
 $(BINDIR)/pgm: pgm.c ../lib/$(LIBZFP)
 	$(CC) $(CFLAGS) $(INCS) pgm.c $(CLIBS) -o $@
@@ -53,4 +60,4 @@ $(BINDIR)/speed: speed.c ../lib/$(LIBZFP)
 	$(CC) $(CFLAGS) $(INCS) speed.c $(CLIBS) -o $@
 
 clean:
-	rm -f $(TARGETS) diffusionC.o
+	rm -f $(TARGETS) diffusionC.o iteratorC.o
diff --git a/fortran/Makefile b/fortran/Makefile
@@ -2,13 +2,13 @@ include ../Config
 
 LIBDIR = ../lib
 MODDIR = ../modules
-TARGETS = $(LIBDIR)/libzFORp.a $(LIBDIR)/libzFORp.so $(MODDIR)/zforp_module.mod
-OBJECTS = zfp.o
-MODULES = zforp_module.mod
+TARGETS = $(LIBDIR)/libzFORp.a $(LIBDIR)/libzFORp.so $(MODDIR)/zfp.mod
+OBJECTS = ../src/zfp.o
+MODULES = zfp.mod
 
-static: $(LIBDIR)/libzFORp.a $(MODDIR)/zforp_module.mod
+static: $(LIBDIR)/libzFORp.a $(MODDIR)/zfp.mod
 
-shared: $(LIBDIR)/libzFORp.so $(MODDIR)/zforp_module.mod
+shared: $(LIBDIR)/libzFORp.so $(MODDIR)/zfp.mod
 
 clean:
 	rm -f $(TARGETS) $(OBJECTS)
@@ -22,9 +22,9 @@ $(LIBDIR)/libzFORp.so: $(OBJECTS)
 	mkdir -p $(LIBDIR)
 	$(FC) $(FFLAGS) -shared $^ -o $@
 
-$(MODDIR)/zforp_module.mod: $(OBJECTS)
+$(MODDIR)/zfp.mod: $(OBJECTS)
 	mkdir -p $(MODDIR)
-	mv zforp_module.mod $(MODDIR)
+	mv zfp.mod $(MODDIR)
 
 .f.o:
 	$(FC) $(FFLAGS) -c $<
diff --git a/include/zfp/cfp.h b/include/zfp/cfp.h
@@ -1,5 +1,5 @@
-#ifndef CFP_ARRAY
-#define CFP_ARRAY
+#ifndef CFP_H
+#define CFP_H
 
 #include <stddef.h>
 #include "zfp/internal/cfp/header.h"

diff --git a/include/zfp/codec/generic.hpp b/include/zfp/codec/generic.hpp
@@ -141,10 +141,10 @@ class generic_base {
   // unit of allocated data in bytes
   static size_t alignment() { return sizeof(InternalType); }
 
-  static const zfp_type type = zfp::trait<ExternalType>::type; // scalar type
+  static const zfp_type type = zfp::internal::trait<ExternalType>::type; // scalar type
 
   // zfp::codec::generic_base::header class for array (de)serialization
-  #include "zfp/internal/array/genheader.hpp"
+  #include "zfp/internal/codec/genheader.hpp"
 
 protected:
   // pointer to beginning of block

diff --git a/include/zfp/codec/zfpcodec.hpp b/include/zfp/codec/zfpcodec.hpp
@@ -112,7 +112,7 @@ class zfp_base {
   // unit of allocated data in bytes
   static size_t alignment() { return stream_alignment() / CHAR_BIT; }
 
-  static const zfp_type type = zfp::trait<Scalar>::type; // scalar type
+  static const zfp_type type = zfp::internal::trait<Scalar>::type; // scalar type
 
   // zfp::codec::zfp_base::header class for array (de)serialization
   #include "zfp/internal/codec/zfpheader.hpp"

diff --git a/include/zfp/constarray1.hpp b/include/zfp/constarray1.hpp
@@ -1,5 +1,5 @@
-#ifndef ZFP_CARRAY1_HPP
-#define ZFP_CARRAY1_HPP
+#ifndef ZFP_CONSTARRAY1_HPP
+#define ZFP_CONSTARRAY1_HPP
 
 #include <cstddef>
 #include <cstring>

diff --git a/include/zfp/constarray2.hpp b/include/zfp/constarray2.hpp
@@ -1,5 +1,5 @@
-#ifndef ZFP_CARRAY2_HPP
-#define ZFP_CARRAY2_HPP
+#ifndef ZFP_CONSTARRAY2_HPP
+#define ZFP_CONSTARRAY2_HPP
 
 #include <cstddef>
 #include <cstring>

diff --git a/include/zfp/constarray3.hpp b/include/zfp/constarray3.hpp
@@ -1,5 +1,5 @@
-#ifndef ZFP_CARRAY3_HPP
-#define ZFP_CARRAY3_HPP
+#ifndef ZFP_CONSTARRAY3_HPP
+#define ZFP_CONSTARRAY3_HPP
 
 #include <cstddef>
 #include <cstring>

diff --git a/include/zfp/constarray4.hpp b/include/zfp/constarray4.hpp
@@ -1,5 +1,5 @@
-#ifndef ZFP_CARRAY4_HPP
-#define ZFP_CARRAY4_HPP
+#ifndef ZFP_CONSTARRAY4_HPP
+#define ZFP_CONSTARRAY4_HPP
 
 #include <cstddef>
 #include <cstring>

diff --git a/include/zfp/factory.hpp b/include/zfp/factory.hpp
@@ -1,7 +1,7 @@
 #ifndef ZFP_FACTORY_HPP
 #define ZFP_FACTORY_HPP
 
-// ensure zfp/array.h has already been included
+// ensure zfp/array.hpp has already been included
 #ifndef ZFP_ARRAY_HPP
   #error "zfp/array.hpp must be included before zfp/factory.hpp"
 #endif

diff --git a/include/zfp/internal/array/traits.hpp b/include/zfp/internal/array/traits.hpp
@@ -2,6 +2,7 @@
 #define ZFP_TRAITS_HPP
 
 namespace zfp {
+namespace internal {
 
 // useful type traits
 template <typename Scalar>
@@ -23,6 +24,7 @@ struct trait<double> {
   static const size_t precision = CHAR_BIT * sizeof(double);
 };
 
+}
 }
 
 #endif
diff --git a/include/zfp/internal/array/genheader.hpp → include/zfp/internal/codec/genheader.hpp b/include/zfp/internal/array/genheader.hpp → include/zfp/internal/codec/genheader.hpp
diff --git a/include/zfp/internal/zfp/inline.h b/include/zfp/internal/zfp/inline.h
@@ -1,5 +1,5 @@
-#ifndef INLINE_H
-#define INLINE_H
+#ifndef ZFP_INLINE_H
+#define ZFP_INLINE_H
 
 #ifndef inline_
   #if __STDC_VERSION__ >= 199901L

diff --git a/tests/Makefile b/tests/Makefile
@@ -2,7 +2,7 @@ include ../Config
 
 BINDIR = ../bin
 TARGETS = $(BINDIR)/testzfp $(BINDIR)/testviews
-INCS = -I../include -I../array
+INCS = -I../include
 LIBS = -L../lib -lzfp
 
 all: $(TARGETS)

diff --git a/tests/fortran/testFortran.f b/tests/fortran/testFortran.f
@@ -1,5 +1,5 @@
 program main
-  use zFORp
+  use zfp
   use iso_c_binding
 
   ! loop counters

diff --git a/tests/testzfp.cpp b/tests/testzfp.cpp
@@ -759,7 +759,7 @@ test(uint dims, ArraySize array_size)
   // determine array size
   uint nx, ny, nz, nw;
   zfp_field* field = zfp_field_alloc();
-  zfp_field_set_type(field, zfp::trait<Scalar>::type);
+  zfp_field_set_type(field, zfp::internal::trait<Scalar>::type);
   zfp_field_set_pointer(field, f);
   switch (dims) {
     case 1: