From 8a67534f0fd362958b328582c2483c74c656231b Mon Sep 17 00:00:00 2001 From: Cirdans-Home Date: Fri, 3 Apr 2020 15:50:09 +0200 Subject: [PATCH] Added CBIND for functions in psb_util_mod --- cbind/Makefile | 17 +++---- cbind/util/Makefile | 41 ++++++++++++++++ cbind/util/psb_c_cutil.h | 16 +++++++ cbind/util/psb_c_dutil.h | 16 +++++++ cbind/util/psb_c_sutil.h | 16 +++++++ cbind/util/psb_c_util_cbind_mod.f90 | 72 +++++++++++++++++++++++++++++ cbind/util/psb_c_zutil.h | 16 +++++++ cbind/util/psb_d_util_cbind_mod.f90 | 72 +++++++++++++++++++++++++++++ cbind/util/psb_s_util_cbind_mod.f90 | 72 +++++++++++++++++++++++++++++ cbind/util/psb_util_cbind.h | 10 ++++ cbind/util/psb_z_util_cbind_mod.f90 | 72 +++++++++++++++++++++++++++++ 11 files changed, 412 insertions(+), 8 deletions(-) create mode 100644 cbind/util/Makefile create mode 100644 cbind/util/psb_c_cutil.h create mode 100644 cbind/util/psb_c_dutil.h create mode 100644 cbind/util/psb_c_sutil.h create mode 100644 cbind/util/psb_c_util_cbind_mod.f90 create mode 100644 cbind/util/psb_c_zutil.h create mode 100644 cbind/util/psb_d_util_cbind_mod.f90 create mode 100644 cbind/util/psb_s_util_cbind_mod.f90 create mode 100644 cbind/util/psb_util_cbind.h create mode 100644 cbind/util/psb_z_util_cbind_mod.f90 diff --git a/cbind/Makefile b/cbind/Makefile index 9beb1604..2abb6cfe 100644 --- a/cbind/Makefile +++ b/cbind/Makefile @@ -6,25 +6,26 @@ INCDIR=../include MODDIR=../modules/ LIBNAME=$(CBINDLIBNAME) -lib: based precd krylovd +lib: based precd krylovd utild /bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR) /bin/cp -p $(CPUPDFLAG) *.h $(INCDIR) - /bin/cp -p $(CPUPDFLAG) *$(.mod) $(MODDIR) + /bin/cp -p $(CPUPDFLAG) *$(.mod) $(MODDIR) based: - cd base && $(MAKE) lib LIBNAME=$(LIBNAME) + cd base && $(MAKE) lib LIBNAME=$(LIBNAME) precd: based - cd prec && $(MAKE) lib LIBNAME=$(LIBNAME) + cd prec && $(MAKE) lib LIBNAME=$(LIBNAME) krylovd: based precd - cd krylov && $(MAKE) lib LIBNAME=$(LIBNAME) + cd krylov && $(MAKE) lib LIBNAME=$(LIBNAME) +utild: based + cd util && $(MAKE) lib LIBNAME=$(LIBNAME) - -clean: +clean: cd base && $(MAKE) clean cd prec && $(MAKE) clean cd krylov && $(MAKE) clean - + cd util && $(MAKE) clean veryclean: clean cd test/pargen && $(MAKE) clean diff --git a/cbind/util/Makefile b/cbind/util/Makefile new file mode 100644 index 00000000..f7980977 --- /dev/null +++ b/cbind/util/Makefile @@ -0,0 +1,41 @@ +TOP=../.. +include $(TOP)/Make.inc +LIBDIR=$(TOP)lib +INCLUDEDIR=$(TOP)/include +MODDIR=$(TOP)/modules +HERE=.. + +FINCLUDES=$(FMFLAG). $(FMFLAG)$(HERE) $(FMFLAG)$(MODDIR) +CINCLUDES=-I. -I$(HERE) -I$(INCLUDEDIR) + +FOBJS= psb_c_util_cbind_mod.o \ + psb_d_util_cbind_mod.o \ + psb_s_util_cbind_mod.o \ + psb_z_util_cbind_mod.o + +# COBJS= psb_c_sutil.o psb_c_dutil.o psb_c_cutil.o psb_c_zutil.o +CMOD= psb_util_cbind.h psb_c_cutil.h psb_c_zutil.h psb_c_dutil.h psb_c_sutil.h +OBJS=$(FOBJS) $(COBJS) + +LIBNAME=$(CBINDLIBNAME) + + +lib: $(OBJS) $(CMOD) + $(AR) $(HERE)/$(LIBNAME) $(OBJS) + $(RANLIB) $(HERE)/$(LIBNAME) + /bin/cp -p *$(.mod) $(CMOD) $(HERE) + +# $(COBJS): $(CMOD) + +psb_util_cbind_mod.o: psb_c_util_cbind_mod.o \ + psb_d_util_cbind_mod.o \ + psb_s_util_cbind_mod.o \ + psb_z_util_cbind_mod.o + +veryclean: clean + /bin/rm -f $(HERE)/$(LIBNAME) + +clean: + /bin/rm -f $(OBJS) *$(.mod) + +veryclean: clean diff --git a/cbind/util/psb_c_cutil.h b/cbind/util/psb_c_cutil.h new file mode 100644 index 00000000..4d2755d6 --- /dev/null +++ b/cbind/util/psb_c_cutil.h @@ -0,0 +1,16 @@ +#ifndef PSB_C_CUTIL_ +#define PSB_C_CUTIL_ +#include "psb_base_cbind.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* I/O Routine */ +psb_i_t psb_c_cmm_mat_write(psb_c_cspmat *ah, char *matrixtitle, char *filename); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif diff --git a/cbind/util/psb_c_dutil.h b/cbind/util/psb_c_dutil.h new file mode 100644 index 00000000..306d7310 --- /dev/null +++ b/cbind/util/psb_c_dutil.h @@ -0,0 +1,16 @@ +#ifndef PSB_C_DUTIL_ +#define PSB_C_DUTIL_ +#include "psb_base_cbind.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* I/O Routine */ +psb_i_t psb_c_dmm_mat_write(psb_c_dspmat *ah, char *matrixtitle, char *filename); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif diff --git a/cbind/util/psb_c_sutil.h b/cbind/util/psb_c_sutil.h new file mode 100644 index 00000000..9dd1ed54 --- /dev/null +++ b/cbind/util/psb_c_sutil.h @@ -0,0 +1,16 @@ +#ifndef PSB_C_SUTIL_ +#define PSB_C_SUTIL_ +#include "psb_base_cbind.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* I/O Routine */ +psb_i_t psb_c_smm_mat_write(psb_c_sspmat *ah, char *matrixtitle, char *filename); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif diff --git a/cbind/util/psb_c_util_cbind_mod.f90 b/cbind/util/psb_c_util_cbind_mod.f90 new file mode 100644 index 00000000..4b67b523 --- /dev/null +++ b/cbind/util/psb_c_util_cbind_mod.f90 @@ -0,0 +1,72 @@ +! +! Parallel Sparse BLAS version 3.5 +! (C) Copyright 2006-2018 +! Salvatore Filippone +! Alfredo Buttari +! +! Redistribution and use in source and binary forms, with or without +! modification, are permitted provided that the following conditions +! are met: +! 1. Redistributions of source code must retain the above copyright +! notice, this list of conditions and the following disclaimer. +! 2. Redistributions in binary form must reproduce the above copyright +! notice, this list of conditions, and the following disclaimer in the +! documentation and/or other materials provided with the distribution. +! 3. The name of the PSBLAS group or the names of its contributors may +! not be used to endorse or promote products derived from this +! software without specific written permission. +! +! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +! TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +! PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PSBLAS GROUP OR ITS CONTRIBUTORS +! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +! POSSIBILITY OF SUCH DAMAGE. +! +! + +module psb_c_util_cbind_mod + use iso_c_binding + use psb_base_mod + use psb_util_mod + use psb_objhandle_mod + use psb_base_string_cbind_mod + +contains + + function psb_c_cmm_mat_write(ah,matrixtitle,filename) bind(c) result(res) + implicit none + real(c_float_complex) :: res + + type(psb_c_cspmat) :: ah + character(c_char) :: matrixtitle(*) + character(c_char) :: filename(*) + + type(psb_cspmat_type), pointer :: ap + character(1024) :: mtitle + character(1024) :: fname + integer(psb_c_ipk_) :: info + + + res = -1.0 + if (c_associated(ah%item)) then + call c_f_pointer(ah%item,ap) + else + return + end if + + call stringc2f(matrixtitle,mtitle) + call stringc2f(filename,fname) + + call mm_mat_write(ap,mtitle,info,filename=fname) + + res = info + + end function psb_c_cmm_mat_write + +end module diff --git a/cbind/util/psb_c_zutil.h b/cbind/util/psb_c_zutil.h new file mode 100644 index 00000000..f5d0f225 --- /dev/null +++ b/cbind/util/psb_c_zutil.h @@ -0,0 +1,16 @@ +#ifndef PSB_C_ZUTIL_ +#define PSB_C_ZUTIL_ +#include "psb_base_cbind.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* I/O Routine */ +psb_i_t psb_c_zmm_mat_write(psb_c_zspmat *ah, char *matrixtitle, char *filename); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif diff --git a/cbind/util/psb_d_util_cbind_mod.f90 b/cbind/util/psb_d_util_cbind_mod.f90 new file mode 100644 index 00000000..4c689fdf --- /dev/null +++ b/cbind/util/psb_d_util_cbind_mod.f90 @@ -0,0 +1,72 @@ +! +! Parallel Sparse BLAS version 3.5 +! (C) Copyright 2006-2018 +! Salvatore Filippone +! Alfredo Buttari +! +! Redistribution and use in source and binary forms, with or without +! modification, are permitted provided that the following conditions +! are met: +! 1. Redistributions of source code must retain the above copyright +! notice, this list of conditions and the following disclaimer. +! 2. Redistributions in binary form must reproduce the above copyright +! notice, this list of conditions, and the following disclaimer in the +! documentation and/or other materials provided with the distribution. +! 3. The name of the PSBLAS group or the names of its contributors may +! not be used to endorse or promote products derived from this +! software without specific written permission. +! +! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +! TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +! PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PSBLAS GROUP OR ITS CONTRIBUTORS +! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +! POSSIBILITY OF SUCH DAMAGE. +! +! + +module psb_d_util_cbind_mod + use iso_c_binding + use psb_base_mod + use psb_util_mod + use psb_objhandle_mod + use psb_base_string_cbind_mod + +contains + + function psb_c_dmm_mat_write(ah,matrixtitle,filename) bind(c) result(res) + implicit none + real(c_double) :: res + + type(psb_c_dspmat) :: ah + character(c_char) :: matrixtitle(*) + character(c_char) :: filename(*) + + type(psb_dspmat_type), pointer :: ap + character(1024) :: mtitle + character(1024) :: fname + integer(psb_c_ipk_) :: info + + + res = -1.0 + if (c_associated(ah%item)) then + call c_f_pointer(ah%item,ap) + else + return + end if + + call stringc2f(matrixtitle,mtitle) + call stringc2f(filename,fname) + + call mm_mat_write(ap,mtitle,info,filename=fname) + + res = info + + end function psb_c_dmm_mat_write + +end module diff --git a/cbind/util/psb_s_util_cbind_mod.f90 b/cbind/util/psb_s_util_cbind_mod.f90 new file mode 100644 index 00000000..010c2604 --- /dev/null +++ b/cbind/util/psb_s_util_cbind_mod.f90 @@ -0,0 +1,72 @@ +! +! Parallel Sparse BLAS version 3.5 +! (C) Copyright 2006-2018 +! Salvatore Filippone +! Alfredo Buttari +! +! Redistribution and use in source and binary forms, with or without +! modification, are permitted provided that the following conditions +! are met: +! 1. Redistributions of source code must retain the above copyright +! notice, this list of conditions and the following disclaimer. +! 2. Redistributions in binary form must reproduce the above copyright +! notice, this list of conditions, and the following disclaimer in the +! documentation and/or other materials provided with the distribution. +! 3. The name of the PSBLAS group or the names of its contributors may +! not be used to endorse or promote products derived from this +! software without specific written permission. +! +! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +! TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +! PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PSBLAS GROUP OR ITS CONTRIBUTORS +! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +! POSSIBILITY OF SUCH DAMAGE. +! +! + +module psb_s_util_cbind_mod + use iso_c_binding + use psb_base_mod + use psb_util_mod + use psb_objhandle_mod + use psb_base_string_cbind_mod + +contains + + function psb_c_smm_mat_write(ah,matrixtitle,filename) bind(c) result(res) + implicit none + real(c_float) :: res + + type(psb_c_sspmat) :: ah + character(c_char) :: matrixtitle(*) + character(c_char) :: filename(*) + + type(psb_sspmat_type), pointer :: ap + character(1024) :: mtitle + character(1024) :: fname + integer(psb_c_ipk_) :: info + + + res = -1.0 + if (c_associated(ah%item)) then + call c_f_pointer(ah%item,ap) + else + return + end if + + call stringc2f(matrixtitle,mtitle) + call stringc2f(filename,fname) + + call mm_mat_write(ap,mtitle,info,filename=fname) + + res = info + + end function psb_c_smm_mat_write + +end module diff --git a/cbind/util/psb_util_cbind.h b/cbind/util/psb_util_cbind.h new file mode 100644 index 00000000..4179b3b1 --- /dev/null +++ b/cbind/util/psb_util_cbind.h @@ -0,0 +1,10 @@ +#ifndef PSB_UTIL_CBIND_ +#define PSB_UTIL_CBIND_ + +#include "psb_c_sutil.h" +#include "psb_c_dutil.h" +#include "psb_c_cutil.h" +#include "psb_c_zutil.h" + + +#endif diff --git a/cbind/util/psb_z_util_cbind_mod.f90 b/cbind/util/psb_z_util_cbind_mod.f90 new file mode 100644 index 00000000..758f28fe --- /dev/null +++ b/cbind/util/psb_z_util_cbind_mod.f90 @@ -0,0 +1,72 @@ +! +! Parallel Sparse BLAS version 3.5 +! (C) Copyright 2006-2018 +! Salvatore Filippone +! Alfredo Buttari +! +! Redistribution and use in source and binary forms, with or without +! modification, are permitted provided that the following conditions +! are met: +! 1. Redistributions of source code must retain the above copyright +! notice, this list of conditions and the following disclaimer. +! 2. Redistributions in binary form must reproduce the above copyright +! notice, this list of conditions, and the following disclaimer in the +! documentation and/or other materials provided with the distribution. +! 3. The name of the PSBLAS group or the names of its contributors may +! not be used to endorse or promote products derived from this +! software without specific written permission. +! +! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +! TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +! PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PSBLAS GROUP OR ITS CONTRIBUTORS +! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +! POSSIBILITY OF SUCH DAMAGE. +! +! + +module psb_z_util_cbind_mod + use iso_c_binding + use psb_base_mod + use psb_util_mod + use psb_objhandle_mod + use psb_base_string_cbind_mod + +contains + + function psb_c_zmm_mat_write(ah,matrixtitle,filename) bind(c) result(res) + implicit none + real(c_double_complex) :: res + + type(psb_c_zspmat) :: ah + character(c_char) :: matrixtitle(*) + character(c_char) :: filename(*) + + type(psb_zspmat_type), pointer :: ap + character(1024) :: mtitle + character(1024) :: fname + integer(psb_c_ipk_) :: info + + + res = -1.0 + if (c_associated(ah%item)) then + call c_f_pointer(ah%item,ap) + else + return + end if + + call stringc2f(matrixtitle,mtitle) + call stringc2f(filename,fname) + + call mm_mat_write(ap,mtitle,info,filename=fname) + + res = info + + end function psb_c_zmm_mat_write + +end module