Portable savetxt and loadtxt

src/stdlib_io.fypp

@@ -19,6 +19,16 @@ module stdlib_io
   ! Private API that is exposed so that we can test it in tests
   public :: parse_mode
 
+  ! Format strings with edit descriptors for each type and kind
+  character(*), parameter :: &
+    FMT_INT = '(*(i0,1x))', &
+    FMT_REAL_SP = '(*(es15.8e2,1x))', &
+    FMT_REAL_DP = '(*(es24.16e3,1x))', &
+    FMT_REAL_QP = '(*(es44.35e4,1x))', &
+    FMT_COMPLEX_SP = '(*(es15.8e2,1x,es15.8e2))', &
+    FMT_COMPLEX_DP = '(*(es24.16e3,1x,es24.16e3))', &
+    FMT_COMPLEX_QP = '(*(es44.35e4,1x,es44.35e4))'
+
   interface loadtxt
     !! version: experimental
     !!
@@ -78,13 +88,22 @@ contains
 
       ! determine number of columns
       ncol = number_of_columns(s)
+      #:if 'complex' in t1
+      ncol = ncol / 2
+      #:endif
 
       ! determine number or rows
-      nrow = number_of_rows_numeric(s)
+      nrow = number_of_rows(s)
 
       allocate(d(nrow, ncol))
       do i = 1, nrow
-        read(s, *) d(i, :)
+        #:if 'real' in t1
+          read(s, FMT_REAL_${k1}$) d(i, :)
+        #:elif 'complex' in t1
+          read(s, FMT_COMPLEX_${k1}$) d(i, :)
+        #:else
+          read(s, *) d(i, :)
+        #:endif
       end do
       close(s)
 
@@ -116,7 +135,15 @@ contains
       integer :: s, i
       s = open(filename, "w")
       do i = 1, size(d, 1)
-        write(s, *) d(i, :)
+        #:if 'real' in t1
+          write(s, FMT_REAL_${k1}$) d(i, :)
+        #:elif 'complex' in t1
+          write(s, FMT_COMPLEX_${k1}$) d(i, :)
+        #:elif 'integer' in t1
+          write(s, FMT_INT) d(i, :)
+        #:else
+          write(s, *) d(i, :)
+        #:endif
       end do
       close(s)
     end subroutine savetxt_${t1[0]}$${k1}$
@@ -147,36 +174,24 @@ contains
   end function number_of_columns
 
 
-  integer function number_of_rows_numeric(s) result(nrows)
+  integer function number_of_rows(s) result(nrows)
     !! version: experimental
     !!
-    !! determine number or rows
-    integer,intent(in)::s
+    !! Determine the number or rows in a file
+    integer, intent(in)::s
     integer :: ios
 
-    real :: r
-    complex :: z
-
     rewind(s)
     nrows = 0
     do
-      read(s, *, iostat=ios) r
+      read(s, *, iostat=ios)
       if (ios /= 0) exit
       nrows = nrows + 1
     end do
 
     rewind(s)
 
-    ! If there are no rows of real numbers, it may be that they are complex
-    if( nrows == 0) then
-      do
-        read(s, *, iostat=ios) z
-        if (ios /= 0) exit
-        nrows = nrows + 1
-      end do
-      rewind(s)
-    end if
-  end function number_of_rows_numeric
+  end function number_of_rows
 
 
   integer function open(filename, mode, iostat) result(u)
@@ -314,4 +329,4 @@ contains
 
   end function parse_mode
 
-end module
+end module stdlib_io

src/tests/CMakeLists.txt

@@ -1,6 +1,18 @@
+fypp_f90("${fyppFlags};-I${CMAKE_CURRENT_SOURCE_DIR}/.." "stdlib_test.fypp" outFiles)
+add_library("${PROJECT_NAME}-testing" "${outFiles}")
+target_link_libraries("${PROJECT_NAME}-testing" PUBLIC "${PROJECT_NAME}")
+set_target_properties(
+  "${PROJECT_NAME}-testing" PROPERTIES
+  Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
+target_include_directories(
+  "${PROJECT_NAME}-testing" PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+)
+
 macro(ADDTEST name)
     add_executable(test_${name} test_${name}.f90)
-    target_link_libraries(test_${name} ${PROJECT_NAME})
+    target_link_libraries(test_${name} "${PROJECT_NAME}-testing")
     add_test(NAME ${name}
              COMMAND $<TARGET_FILE:test_${name}> ${CMAKE_CURRENT_BINARY_DIR}
              WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
@@ -16,6 +28,7 @@ add_subdirectory(sorting)
 add_subdirectory(stats)
 add_subdirectory(string)
 add_subdirectory(system)
+add_subdirectory(test)
 add_subdirectory(quadrature)
 add_subdirectory(math)
 add_subdirectory(stringlist)

src/tests/Makefile.manual

@@ -1,6 +1,15 @@
 .PHONY: all clean test
 
-all test clean:
+LIB = libstdlib-testing.a
+SRCFYPP = stdlib_test.fypp
+SRCGEN = $(SRCFYPP:.fypp=.f90)
+SRC = $(SRCGEN)
+OBJS = $(SRC:.f90=.o)
+MODS = $(OBJS:.o=.mod)
+
+all test:: $(LIB)
+
+all test clean::
 	$(MAKE) -f Makefile.manual --directory=ascii $@
 	$(MAKE) -f Makefile.manual --directory=bitsets $@
 	$(MAKE) -f Makefile.manual --directory=io $@
@@ -10,6 +19,19 @@ all test clean:
 	$(MAKE) -f Makefile.manual --directory=quadrature $@
 	$(MAKE) -f Makefile.manual --directory=stats $@
 	$(MAKE) -f Makefile.manual --directory=string $@
+	$(MAKE) -f Makefile.manual --directory=test $@
 	$(MAKE) -f Makefile.manual --directory=math $@
 	$(MAKE) -f Makefile.manual --directory=stringlist $@
 	$(MAKE) -f Makefile.manual --directory=linalg $@
+
+$(LIB): $(OBJS)
+	ar rcs $@ $^
+
+clean::
+	$(RM) $(LIB) $(OBJS) $(MODS) $(SRCGEN)
+
+%.o: %.f90
+	$(FC) $(FFLAGS) -I.. -c $<
+
+$(SRCGEN): %.f90: %.fypp ../common.fypp
+	fypp $(FYPPFLAGS) -I.. $< $@

src/tests/Makefile.manual.test.mk

@@ -1,8 +1,8 @@
 # Common Makefile rules that are included from each test subdirectory's
 # Makefile
 
-CPPFLAGS += -I../..
-LDFLAGS += -L../.. -lstdlib
+CPPFLAGS += -I../.. -I..
+LDFLAGS += -L../.. -L.. -lstdlib-testing -lstdlib
 
 OBJS = $(PROGS_SRC:.f90=.o)
 PROGS = $(OBJS:.o=)