Fix Makefile & replace dp with rk.

zoziha · zoziha · commit 5601a66e02c9 · 2022-01-27T18:06:49.000+08:00
diff --git a/README.md b/README.md
@@ -12,12 +12,12 @@ cd fftpack
 ```
 
 ### Build with [fortran-lang/fpm](https://github.com/fortran-lang/fpm)
-Fortran Package Manager (fpm) is a great package manager and build system for Fortran.   
+Fortran Package Manager (fpm) is a package manager and build system for Fortran.   
 You can build using provided `fpm.toml`:
 ```bash
-fpm build --flag "-O2"
-fpm test --flag "-O2" --list
-fpm test --flag "-O2" <test_name, see `fpm.toml` or list>
+fpm build
+fpm test --list
+fpm test <test_name, see `fpm.toml` or list>
 ```
 To use `fftpack` within your `fpm` project, add the following to your `fpm.toml` file:
 ```toml
diff --git a/example/bench1.f90 b/example/bench1.f90
@@ -1,10 +1,10 @@
 program bench1
 use fftpack, only: zffti, zfftf, zfftb
+use fftpack_kind, only: rk
 implicit none
-integer, parameter :: dp = kind(0.d0)
-complex(dp), allocatable :: z(:)
-real(dp), allocatable :: w(:), x(:)
-real(dp) :: err, time_init, time_forward, time_backward, t1, t2
+complex(rk), allocatable :: z(:)
+real(rk), allocatable :: w(:), x(:)
+real(rk) :: err, time_init, time_forward, time_backward, t1, t2
 integer :: N
 
 N = 1024*1014*16
@@ -32,7 +32,7 @@ program bench1
 time_backward = t2-t1
 print *, "Done"
 
-err = maxval(abs(x-real(z/N,dp)))
+err = maxval(abs(x-real(z/N,rk)))
 print *
 print *, "Error: ", err
 print *, "Init time: ", time_init
diff --git a/src/Makefile b/src/Makefile
@@ -1,53 +1,53 @@
 SRCF = \
-	zfftb.f\
-	cfftb1.f\
-	zfftf.f\
-	cfftf1.f\
-	zffti.f\
-	cffti1.f\
-	dcosqb.f\
-	cosqb1.f\
-	dcosqf.f\
-	cosqf1.f\
-	dcosqi.f\
-	dcost.f\
-	dcosti.f\
-	ezfft1.f\
-	dzfftb.f\
-	dzfftf.f\
-	dzffti.f\
-	passb.f\
-	passb2.f\
-	passb3.f\
-	passb4.f\
-	passb5.f\
-	passf.f\
-	passf2.f\
-	passf3.f\
-	passf4.f\
-	passf5.f\
-	radb2.f\
-	radb3.f\
-	radb4.f\
-	radb5.f\
-	radbg.f\
-	radf2.f\
-	radf3.f\
-	radf4.f\
-	radf5.f\
-	radfg.f\
-	dfftb.f\
-	rfftb1.f\
-	dfftf.f\
-	rfftf1.f\
-	dffti.f\
-	rffti1.f\
-	dsinqb.f\
-	dsinqf.f\
-	dsinqi.f\
-	dsint.f\
-	sint1.f\
-	dsinti.f
+	zfftb.f90\
+	cfftb1.f90\
+	zfftf.f90\
+	cfftf1.f90\
+	zffti.f90\
+	cffti1.f90\
+	dcosqb.f90\
+	cosqb1.f90\
+	dcosqf.f90\
+	cosqf1.f90\
+	dcosqi.f90\
+	dcost.f90\
+	dcosti.f90\
+	ezfft1.f90\
+	dzfftb.f90\
+	dzfftf.f90\
+	dzffti.f90\
+	passb.f90\
+	passb2.f90\
+	passb3.f90\
+	passb4.f90\
+	passb5.f90\
+	passf.f90\
+	passf2.f90\
+	passf3.f90\
+	passf4.f90\
+	passf5.f90\
+	radb2.f90\
+	radb3.f90\
+	radb4.f90\
+	radb5.f90\
+	radbg.f90\
+	radf2.f90\
+	radf3.f90\
+	radf4.f90\
+	radf5.f90\
+	radfg.f90\
+	dfftb.f90\
+	rfftb1.f90\
+	dfftf.f90\
+	rfftf1.f90\
+	dffti.f90\
+	rffti1.f90\
+	dsinqb.f90\
+	dsinqf.f90\
+	dsinqi.f90\
+	dsint.f90\
+	sint1.f90\
+	dsinti.f90
 
 SRCF90 = \
 	fftpack.f90\
@@ -59,9 +59,10 @@ SRCF90 = \
 	fftpack_ifftshift.f90\
 	fftpack_qct.f90\
 	fftpack_iqct.f90\
-	fftpack_dct.f90
+	fftpack_dct.f90\
+	rk.f90
 
-OBJF := $(SRCF:.f=.o)
+OBJF := $(SRCF:.f90=.o)
 OBJF90 := $(SRCF90:.f90=.o)
 
 lib$(LIB).a: $(OBJF) $(OBJF90)
@@ -76,12 +77,62 @@ clean:
 %.o: %.f90
 	$(FC) $(FFLAGS) -c $<
 
-fftpack_fft.o: fftpack.o
-fftpack_ifft.o: fftpack.o
-fftpack_rfft.o: fftpack.o
-fftpack_irfft.o: fftpack.o
-fftpack_qct.o: fftpack.o
-fftpack_iqct.o: fftpack.o
-fftpack_dct.o: fftpack.o
-fftpack_fftshift.o: fftpack.o
-fftpack_ifftshift.o: fftpack.o
+fftpack_fft.o: fftpack.o rk.o
+fftpack_ifft.o: fftpack.o rk.o
+fftpack_rfft.o: fftpack.o rk.o
+fftpack_irfft.o: fftpack.o rk.o
+fftpack_qct.o: fftpack.o rk.o
+fftpack_iqct.o: fftpack.o rk.o
+fftpack_dct.o: fftpack.o rk.o
+fftpack_fftshift.o: fftpack.o rk.o
+fftpack_ifftshift.o: fftpack.o rk.o
+
+zfftb.f90: rk.o
+cfftb1.f90: rk.o
+zfftf.f90: rk.o
+cfftf1.f90: rk.o
+zffti.f90: rk.o
+cffti1.f90: rk.o
+dcosqb.f90: rk.o
+cosqb1.f90: rk.o
+dcosqf.f90: rk.o
+cosqf1.f90: rk.o
+dcosqi.f90: rk.o
+dcost.f90: rk.o
+dcosti.f90: rk.o
+ezfft1.f90: rk.o
+dzfftb.f90: rk.o
+dzfftf.f90: rk.o
+dzffti.f90: rk.o
+passb.f90: rk.o
+passb2.f90: rk.o
+passb3.f90: rk.o
+passb4.f90: rk.o
+passb5.f90: rk.o
+passf.f90: rk.o
+passf2.f90: rk.o
+passf3.f90: rk.o
+passf4.f90: rk.o
+passf5.f90: rk.o
+radb2.f90: rk.o
+radb3.f90: rk.o
+radb4.f90: rk.o
+radb5.f90: rk.o
+radbg.f90: rk.o
+radf2.f90: rk.o
+radf3.f90: rk.o
+radf4.f90: rk.o
+radf5.f90: rk.o
+radfg.f90: rk.o
+dfftb.f90: rk.o
+rfftb1.f90: rk.o
+dfftf.f90: rk.o
+rfftf1.f90: rk.o
+dffti.f90: rk.o
+rffti1.f90: rk.o
+dsinqb.f90: rk.o
+dsinqf.f90: rk.o
+dsinqi.f90: rk.o
+dsint.f90: rk.o
+sint1.f90: rk.o
+dsinti.f90: rk.o
diff --git a/src/fftpack.f90 b/src/fftpack.f90
@@ -18,6 +18,8 @@ module fftpack
 
     public :: dcosti, dcost
     public :: dct, idct
+    
+    public :: rk
 
     interface
 
@@ -157,20 +159,20 @@ end subroutine dcosqb
         !>
         !> Initialize `dcost`. ([Specification](../page/specs/fftpack.html#dcosti))
         pure subroutine dcosti(n, wsave)
-            import dp
+            import rk
             integer, intent(in) :: n
-            real(kind=dp), intent(out) :: wsave(*)
+            real(kind=rk), intent(out) :: wsave(*)
         end subroutine dcosti
 
         !> Version: experimental
         !>
         !> Discrete fourier cosine transform of an even sequence.
         !> ([Specification](../page/specs/fftpack.html#dcost))
         pure subroutine dcost(n, x, wsave)
-            import dp
+            import rk
             integer, intent(in) :: n
-            real(kind=dp), intent(inout) :: x(*)
-            real(kind=dp), intent(in) :: wsave(*)
+            real(kind=rk), intent(inout) :: x(*)
+            real(kind=rk), intent(in) :: wsave(*)
         end subroutine dcost
 
     end interface
@@ -252,19 +254,19 @@ end function iqct_rk
     !> Discrete fourier cosine (forward) transform of an even sequence.
     !> ([Specification](../page/specs/fftpack.html#dct))
     interface dct
-        pure module function dct_dp(x, n) result(result)
-            real(kind=dp), intent(in) :: x(:)
+        pure module function dct_rk(x, n) result(result)
+            real(kind=rk), intent(in) :: x(:)
             integer, intent(in), optional :: n
-            real(kind=dp), allocatable :: result(:)
-        end function dct_dp
+            real(kind=rk), allocatable :: result(:)
+        end function dct_rk
     end interface dct
 
     !> Version: experimental
     !>
     !> Discrete fourier cosine (backward) transform of an even sequence.
     !> ([Specification](../page/specs/fftpack.html#idct))
     interface idct
-        module procedure :: dct_dp
+        module procedure :: dct_rk
     end interface idct
 
     !> Version: experimental
diff --git a/src/fftpack_dct.f90 b/src/fftpack_dct.f90
@@ -3,20 +3,20 @@
 contains
 
     !> Discrete fourier cosine transform of an even sequence.
-    pure module function dct_dp(x, n) result(result)
-        real(kind=dp), intent(in) :: x(:)
+    pure module function dct_rk(x, n) result(result)
+        real(kind=rk), intent(in) :: x(:)
         integer, intent(in), optional :: n
-        real(kind=dp), allocatable :: result(:)
+        real(kind=rk), allocatable :: result(:)
 
         integer :: lenseq, lensav, i
-        real(kind=dp), allocatable :: wsave(:)
+        real(kind=rk), allocatable :: wsave(:)
 
         if (present(n)) then
             lenseq = n
             if (lenseq <= size(x)) then
                 result = x(:lenseq)
             else if (lenseq > size(x)) then
-                result = [x, (0.0_dp, i=1, lenseq - size(x))]
+                result = [x, (0.0_rk, i=1, lenseq - size(x))]
             end if
         else
             lenseq = size(x)
@@ -31,6 +31,6 @@ pure module function dct_dp(x, n) result(result)
         !> Discrete fourier cosine transformation
         call dcost(lenseq, result, wsave)
 
-    end function dct_dp
+    end function dct_rk
 
 end submodule fftpack_dct
diff --git a/test/Makefile b/test/Makefile
@@ -13,7 +13,7 @@ all: tstfft \
 	fftpack_dct
 
 # Orginal test
-tstfft: tstfft.o
+tstfft: tstfft.f
 	$(FC) $(FFLAGS) $< -L../src -l$(LIB) -I../src -o $@.x
 	time ./tstfft.x
 
@@ -68,4 +68,4 @@ fftpack_ifftshift: test_fftpack_ifftshift.f90
 	./fftpack_ifftshift.x
 
 clean:
-	rm -f -r *.o *.x
+	rm -f -r *.o *.x
diff --git a/test/test_fftpack_dcosq.f90 b/test/test_fftpack_dcosq.f90
@@ -13,7 +13,7 @@ end subroutine check
 
     subroutine test_fftpack_dcosq_real
         use fftpack, only: dcosqi, dcosqf, dcosqb
-    use fftpack_kind
+        use fftpack_kind
         real(kind=rk) :: w(3*4 + 15)
         real(kind=rk) :: x(4) = [1, 2, 3, 4]
         real(kind=rk) :: eps = 1.0e-10_rk
diff --git a/test/test_fftpack_dcost.f90 b/test/test_fftpack_dcost.f90
@@ -13,17 +13,17 @@ end subroutine check
 
     subroutine test_fftpack_dcost_real
         use fftpack, only: dcosti, dcost
-        use iso_fortran_env, only: dp => real64
-        real(kind=dp) :: w(3*4 + 15)
-        real(kind=dp) :: x(4) = [1, 2, 3, 4]
-        real(kind=dp) :: eps = 1.0e-10_dp
+        use fftpack_kind
+        real(kind=rk) :: w(3*4 + 15)
+        real(kind=rk) :: x(4) = [1, 2, 3, 4]
+        real(kind=rk) :: eps = 1.0e-10_rk
 
         call dcosti(4, w)
         call dcost(4, x, w)
-        call check(all(x == [real(kind=dp) :: 15, -4, 0, -1.0000000000000009_dp]), msg="`dcosti` failed.")
+        call check(all(x == [real(kind=rk) :: 15, -4, 0, -1.0000000000000009_rk]), msg="`dcosti` failed.")
 
         call dcost(4, x, w)
-        call check(all(x/(2.0_dp*(4.0_dp - 1.0_dp)) == [real(kind=dp) :: 1, 2, 3, 4]), msg="`dcost` failed.")
+        call check(all(x/(2.0_rk*(4.0_rk - 1.0_rk)) == [real(kind=rk) :: 1, 2, 3, 4]), msg="`dcost` failed.")
 
     end subroutine test_fftpack_dcost_real
 
diff --git a/test/test_fftpack_dct.f90 b/test/test_fftpack_dct.f90
