Add C conversions of the CBLAS tests for NOFORTRAN=1 builds

ctest/CMakeLists.txt

@@ -1,7 +1,9 @@
 include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${PROJECT_BINARY_DIR})
 
+if (NOT NOFORTRAN)
 enable_language(Fortran)
+endif()
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DADD${BU} -DCBLAS")
 if (CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
@@ -28,14 +30,24 @@ foreach(float_type ${FLOAT_TYPES})
    continue()
   endif()
   #level1
+if (NOT NOFORTRAN)
   add_executable(x${float_char}cblat1
     c_${float_char}blat1.f
     c_${float_char}blas1.c)
+else()
+  add_executable(x${float_char}cblat1
+    c_${float_char}blat1c.c
+    c_${float_char}blas1.c)
+endif()
   target_link_libraries(x${float_char}cblat1 ${OpenBLAS_LIBNAME})
+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+      target_link_libraries(x${float_char}cblat1 m)
+  endif()
   add_test(NAME "x${float_char}cblat1"
     COMMAND $<TARGET_FILE:x${float_char}cblat1>)
 
   #level2
+if (NOT NOFORTRAN)
   add_executable(x${float_char}cblat2
     c_${float_char}blat2.f
     c_${float_char}blas2.c
@@ -43,11 +55,24 @@ foreach(float_type ${FLOAT_TYPES})
     auxiliary.c
     c_xerbla.c
     constant.c)
+else()
+  add_executable(x${float_char}cblat2
+    c_${float_char}blat2c.c
+    c_${float_char}blas2.c
+    c_${float_char}2chke.c
+    auxiliary.c
+    c_xerbla.c
+    constant.c)
+endif()
   target_link_libraries(x${float_char}cblat2 ${OpenBLAS_LIBNAME})
+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+    target_link_libraries(x${float_char}cblat2 m)
+  endif()
   add_test(NAME "x${float_char}cblat2"
     COMMAND ${test_helper} $<TARGET_FILE:x${float_char}cblat2> "${PROJECT_SOURCE_DIR}/ctest/${float_char}in2")
 
   #level3
+if (NOT NOFORTRAN)
   add_executable(x${float_char}cblat3
     c_${float_char}blat3.f
     c_${float_char}blas3.c
@@ -55,7 +80,19 @@ foreach(float_type ${FLOAT_TYPES})
     auxiliary.c
     c_xerbla.c
     constant.c)
+else()
+  add_executable(x${float_char}cblat3
+    c_${float_char}blat3c.c
+    c_${float_char}blas3.c
+    c_${float_char}3chke.c
+    auxiliary.c
+    c_xerbla.c
+    constant.c)
+endif()
   target_link_libraries(x${float_char}cblat3 ${OpenBLAS_LIBNAME})
+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+    target_link_libraries(x${float_char}cblat3 m)
+  endif()
   add_test(NAME "x${float_char}cblat3"
     COMMAND ${test_helper} $<TARGET_FILE:x${float_char}cblat3> "${PROJECT_SOURCE_DIR}/ctest/${float_char}in3")
 

ctest/Makefile

@@ -43,11 +43,7 @@ ztestl3o = c_zblas3.o c_z3chke.o auxiliary.o c_xerbla.o constant.o
 ztestl3o_3m = c_zblas3_3m.o c_z3chke_3m.o auxiliary.o c_xerbla.o constant.o
 
 
-ifeq ($(NOFORTRAN),1)
-all ::
-else
 all :: all1 all2 all3
-endif
 
 ifeq ($(BUILD_SINGLE),1)
 all1targets += xscblat1
@@ -222,53 +218,83 @@ endif
 
 ifeq ($(BUILD_SINGLE),1)
 # Single real
+ifneq ($(NOFORTRAN),1)
 xscblat1: $(stestl1o) c_sblat1.o $(TOPDIR)/$(LIBNAME)
 	$(FC) $(FLDFLAGS) -o xscblat1 c_sblat1.o $(stestl1o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
-
 xscblat2: $(stestl2o) c_sblat2.o $(TOPDIR)/$(LIBNAME)
 	$(FC) $(FLDFLAGS) -o xscblat2 c_sblat2.o $(stestl2o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
-
 xscblat3: $(stestl3o) c_sblat3.o $(TOPDIR)/$(LIBNAME)
 	$(FC) $(FLDFLAGS) -o xscblat3 c_sblat3.o $(stestl3o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+else
+xscblat1: $(stestl1o) c_sblat1c.o $(TOPDIR)/$(LIBNAME)
+	$(CC) $(LDFLAGS) -o xscblat1 c_sblat1c.o $(stestl1o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+xscblat2: $(stestl2o) c_sblat2c.o $(TOPDIR)/$(LIBNAME)
+	$(CC) $(LDFLAGS) -o xscblat2 c_sblat2c.o $(stestl2o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+xscblat3: $(stestl3o) c_sblat3c.o $(TOPDIR)/$(LIBNAME)
+	$(CC) $(LDFLAGS) -o xscblat3 c_sblat3c.o $(stestl3o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+endif
 endif
 
 ifeq ($(BUILD_DOUBLE),1)
 # Double real
+ifneq ($(NOFORTRAN),1)
 xdcblat1: $(dtestl1o) c_dblat1.o $(TOPDIR)/$(LIBNAME)
 	$(FC) $(FLDFLAGS) -o xdcblat1 c_dblat1.o $(dtestl1o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
 xdcblat2: $(dtestl2o) c_dblat2.o $(TOPDIR)/$(LIBNAME)
 	$(FC) $(FLDFLAGS) -o xdcblat2 c_dblat2.o $(dtestl2o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
 xdcblat3: $(dtestl3o) c_dblat3.o $(TOPDIR)/$(LIBNAME)
 	$(FC) $(FLDFLAGS) -o xdcblat3 c_dblat3.o $(dtestl3o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+else
+xdcblat1: $(dtestl1o) c_dblat1c.o $(TOPDIR)/$(LIBNAME)
+	$(CC) $(LDFLAGS) -o xdcblat1 c_dblat1c.o $(dtestl1o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+xdcblat2: $(dtestl2o) c_dblat2c.o $(TOPDIR)/$(LIBNAME)
+	$(CC) $(LDFLAGS) -o xdcblat2 c_dblat2c.o $(dtestl2o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+xdcblat3: $(dtestl3o) c_dblat3c.o $(TOPDIR)/$(LIBNAME)
+	$(CC) $(LDFLAGS) -o xdcblat3 c_dblat3c.o $(dtestl3o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+endif
 endif
-
 
 ifeq ($(BUILD_COMPLEX),1)
 # Single complex
+ifneq ($(NOFORTRAN),1)
 xccblat1: $(ctestl1o) c_cblat1.o $(TOPDIR)/$(LIBNAME)
 	$(FC) $(FLDFLAGS) -o xccblat1 c_cblat1.o $(ctestl1o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
 xccblat2: $(ctestl2o) c_cblat2.o $(TOPDIR)/$(LIBNAME)
 	$(FC) $(FLDFLAGS) -o xccblat2 c_cblat2.o $(ctestl2o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
 xccblat3: $(ctestl3o) c_cblat3.o $(TOPDIR)/$(LIBNAME)
 	$(FC) $(FLDFLAGS) -o xccblat3 c_cblat3.o $(ctestl3o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
-
 xccblat3_3m: $(ctestl3o_3m) c_cblat3_3m.o $(TOPDIR)/$(LIBNAME)
 	$(FC) $(FLDFLAGS) -o xccblat3_3m c_cblat3_3m.o $(ctestl3o_3m) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+else
+xccblat1: $(ctestl1o) c_cblat1c.o $(TOPDIR)/$(LIBNAME)
+	$(CC) $(LDFLAGS) -o xccblat1 c_cblat1c.o $(ctestl1o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+xccblat2: $(ctestl2o) c_cblat2c.o $(TOPDIR)/$(LIBNAME)
+	$(CC) $(LDFLAGS) -o xccblat2 c_cblat2c.o $(ctestl2o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+xccblat3: $(ctestl3o) c_cblat3c.o $(TOPDIR)/$(LIBNAME)
+	$(CC) $(LDFLAGS) -o xccblat3 c_cblat3c.o $(ctestl3o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+endif
 endif
 
 
 ifeq ($(BUILD_COMPLEX16),1)
 # Double complex
+ifneq ($(NOFORTRAN),1)
 xzcblat1: $(ztestl1o) c_zblat1.o $(TOPDIR)/$(LIBNAME)
 	$(FC) $(FLDFLAGS) -o xzcblat1 c_zblat1.o $(ztestl1o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
 xzcblat2: $(ztestl2o) c_zblat2.o $(TOPDIR)/$(LIBNAME)
 	$(FC) $(FLDFLAGS) -o xzcblat2 c_zblat2.o $(ztestl2o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
 xzcblat3: $(ztestl3o) c_zblat3.o $(TOPDIR)/$(LIBNAME)
 	$(FC) $(FLDFLAGS) -o xzcblat3 c_zblat3.o $(ztestl3o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
-
-
 xzcblat3_3m: $(ztestl3o_3m) c_zblat3_3m.o $(TOPDIR)/$(LIBNAME)
 	$(FC) $(FLDFLAGS) -o xzcblat3_3m c_zblat3_3m.o $(ztestl3o_3m) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+else
+xzcblat1: $(ztestl1o) c_zblat1c.o $(TOPDIR)/$(LIBNAME)
+	$(CC) $(LDFLAGS) -o xzcblat1 c_zblat1c.o $(ztestl1o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+xzcblat2: $(ztestl2o) c_zblat2c.o $(TOPDIR)/$(LIBNAME)
+	$(CC) $(LDFLAGS) -o xzcblat2 c_zblat2c.o $(ztestl2o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+xzcblat3: $(ztestl3o) c_zblat3c.o $(TOPDIR)/$(LIBNAME)
+	$(CC) $(LDFLAGS) -o xzcblat3 c_zblat3c.o $(ztestl3o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+endif
 endif
 
 include $(TOPDIR)/Makefile.tail