diff --git a/.VERSION b/.VERSION index 1263e4764..a50b5ca72 100644 --- a/.VERSION +++ b/.VERSION @@ -1,6 +1,6 @@ $Format:%d%n%n$ # Fall back version, probably last release: -3.9.0 +3.9.1 # PSBLAS version file. # diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..999de8cf5 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,36 @@ +*.a export-ignore +*.o export-ignore +*.mod export-ignore +*.smod export-ignore +*~ export-ignore +.git* export-ignore +rsb export-ignore +rsb/ export-ignore +rsb/** export-ignore + + +Make.inc export-ignore +config export-ignore +config/ export-ignore +config/** export-ignore +configure.ac export-ignore +config.log export-ignore +config.status export-ignore +aclocal.m4 export-ignore +autogen.sh export-ignore +autom4te.cache export-ignore +Dockerfile export-ignore +.travis.yml export-ignore +# generated folder +./include/** export-ignore +./modules/** export-ignore +docs/src export-ignore +docs/doxypsb export-ignore +docs/Makefile export-ignore + +# the executable from tests +test/computational_routines export-ignore +test/computational_routines export-ignore +test/omp export-ignore +test/openacc export-ignore +test/torture export-ignore diff --git a/CMakeLists.txt b/CMakeLists.txt index 96bcb7574..90685757e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ #----------------------------------- # Set oldest allowable CMake version #----------------------------------- -cmake_minimum_required(VERSION 3.11) +cmake_minimum_required(VERSION 3.11...4.2) cmake_policy(VERSION 3.11.1...3.13.3) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") @@ -132,12 +132,10 @@ include("${CMAKE_CURRENT_LIST_DIR}/cmake/CapitalizeString.cmake") message(STATUS "Using compiler ${CMAKE_C_COMPILER};") -# Define Major and Minor Version and Patch Level, String Version -set(PSBLASMAJOR "3") -set(PSBLASMINOR "9") -set(PSBLASPATCH "0") -set(PSBLASSTRING "\"3.9.0\"") - +# Find PSBLAS constants +include(${CMAKE_CURRENT_LIST_DIR}/cmake/readPSBConst.cmake) +_psb_read_const() +_psb_read_desc_const() # Set default values for IPK_SIZE and LPK_SIZE set(DEFAULT_IPK_SIZE 4) @@ -427,6 +425,7 @@ find_package(METIS) if(METIS_FOUND) + include(CheckTypeSize) message(STATUS "METIS PATH ${METIS_INCLUDES} and metis libraries ${METIS_LIBRARIES}") # Make sure this path is correct # set(METISINCFILE "metis.h") # Adjust this to your actual path @@ -444,6 +443,9 @@ if(METIS_FOUND) # Check for real sizes using try_compile include(CheckCSourceCompiles) + + +#[=====[ # Function to check the size of a type function(check_metis_real_type type_name) set(source_code " @@ -455,25 +457,42 @@ if(METIS_FOUND) }") # Create a temporary source file - file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/test_size.c" "${source_code}") + #file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/test_size.c" "${source_code}") # Try to compile it - try_compile(COMPILER_RESULT "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp" - "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/test_size.c") + #try_compile(COMPILER_RESULT "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp" + # "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/test_size.c") # Check the result and read the output - if (COMPILER_RESULT) + + set(test_file "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/test_metis_size.c") + file(WRITE "${test_file}" "${source_code}") + + # Use try_run to compile AND execute + try_run(RUN_RESULT COMPILE_RESULT + "${CMAKE_BINARY_DIR}" + "${test_file}" + CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${METIS_INCLUDES}" + RUN_OUTPUT_VARIABLE type_size + COMPILE_OUTPUT_VARIABLE compile_log + ) + + if(COMPILE_RESULT AND (RUN_RESULT EQUAL 0)) + # if (COMPILER_RESULT) execute_process(COMMAND "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/test_size" OUTPUT_VARIABLE type_size) string(STRIP "${type_size}" type_size) + message(STATUS "Metis ?: ${type_size};") if (type_name STREQUAL "float") set(PSB_METIS_REAL_32 "${type_size}" PARENT_SCOPE) + message(STATUS "Metis 32: ${type_size}") # add_definitions(-DPSB_METIS_REAL_32) set(CREALMETIS "#define PSB_METIS_REAL_32" PARENT_SCOPE) elseif (type_name STREQUAL "double") set(PSB_METIS_REAL_64 "${type_size}" PARENT_SCOPE) #add_definitions(-DPSB_METIS_REAL_64) - set(CREALMETIS "#define PSB_METIS_REAL_64" PARENT_SCOPE) + set(CREALMETIS "#define PSB_METIS_REAL_64" PARENT_SCOPE) + message(STATUS "Metis 64: ${type_size}") endif() else() message(WARNING "Failed to compile test for type size: ${type_name}") @@ -483,44 +502,65 @@ if(METIS_FOUND) # Check for both float and double check_metis_real_type(float) check_metis_real_type(double) - +#]=====] # Set HAVE_METIS if METIS is found #add_compile_options(-DPSB_HAVE_METIS) # set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -DPSB_HAVE_METIS") - - - - - # Determine METIS_INDEX based on real type sizes - if(DEFINED PSB_METIS_REAL_32) - set(METIS_INDEX 32) - elseif(DEFINED PSB_METIS_REAL_64) - set(METIS_INDEX 64) - else() - message(WARNING "Neither METIS_REAL_32 nor METIS_REAL_64 is defined.") - set(METIS_INDEX 64) # Default to 64 if not defined - endif() - - # Check conditions for LPK_SIZE and METIS_INDEX - if(LPK_SIZE STREQUAL "4") - if(METIS_INDEX STREQUAL "64") - # Mismatch between METIS size and PSBLAS LPK - message(FATAL " Mismatch between metis ${METIS_INDEX} size and psblas LPK size ${LPK_SIZE}") - set(METIS_FOUND FALSE) + # 1. Tell CMake where to find metis.h for the check +set(CMAKE_EXTRA_INCLUDE_FILES "${METIS_INCLUDES}/metis.h") + +# 2. Check the size of Metis's own type: real_t +# This replaces checking 'float' and 'double' separately +check_type_size("real_t" METIS_REAL_SIZE) +check_type_size("idx_t" METIS_IDX_SIZE) + +# 3. Handle the result +if(METIS_IDX_SIZE) + if(METIS_IDX_SIZE EQUAL 4) + set(CINTMETIS "#define PSB_METIS_32") + message(STATUS "Metis detected as 32-bit (idx_t is 4 bytes)") + set(METIS_INDEX 32) + elseif(METIS_IDX_SIZE EQUAL 8) + set(CINTMETIS "#define PSB_METIS_64") + message(STATUS "Metis detected as 64-bit (idx_t is 8 bytes)") + set(METIS_INDEX 64) endif() - endif() - - if(LPK_SIZE STREQUAL "8") - if(METIS_INDEX STREQUAL "32") - # Mismatch between METIS size and PSBLAS LPK - message(FATAL " Mismatch between metis ${METIS_INDEX} size and psblas LPK size ${LPK_SIZE}") - set(METIS_FOUND FALSE) +else() + message(WARNING "Could not determine size of idx_t from metis.h. Check METIS_INCLUDES.") +endif() +# 3. Handle the result +if(METIS_REAL_SIZE) + if(METIS_REAL_SIZE EQUAL 4) + set(CREALMETIS "#define PSB_METIS_REAL_32") + message(STATUS "Metis detected as 32-bit (real_t is 4 bytes)") + elseif(METIS_REAL_SIZE EQUAL 8) + set(CREALMETIS "#define PSB_METIS_REAL_64") + message(STATUS "Metis detected as 64-bit (real_t is 8 bytes)") endif() - endif() +else() + message(WARNING "Could not determine size of real_t from metis.h. Check METIS_INCLUDES.") +endif() + +# clean the variable +set(CMAKE_EXTRA_INCLUDE_FILES "") + +# Mismatch Logic Below +if(LPK_SIZE STREQUAL "4" AND METIS_INDEX EQUAL 64) + message(WARNING "Mismatch: Metis IDX is 64-bit but PSBLAS LPK is 32-bit") + set(METIS_FOUND FALSE) + set(CREALMETIS "") + set(CINTMETIS "") +elseif(LPK_SIZE STREQUAL "8" AND METIS_INDEX EQUAL 32) + set(METIS_FOUND FALSE) + message(WARNING "Mismatch: Metis IDX is 32-bit but PSBLAS LPK is 64-bit") + set(CREALMETIS "") + set(CINTMETIS "") +endif() + - if(METIS_FOUND) +if(METIS_FOUND) # Make sure this path is correct set(METISINCFILE "metis.h") # Adjust this to your actual path @@ -539,7 +579,7 @@ if(METIS_FOUND) set(CHAVEMETIS "#define PSB_HAVE_METIS") - set(CINTMETIS "#define PSB_METIS_${METIS_INDEX}") +# set(CINTMETIS "#define PSB_METIS_${METIS_INDEX}") # set(CREALMETIS "#define PSB_METIS_REAL_${LPK_SIZE}") # Configure the header file configure_file(${HEADER_TEMPLATE} ${HEADER_OUTPUT} @ONLY) @@ -644,7 +684,7 @@ install(EXPORT ${CMAKE_PROJECT_NAME}-targets include(CMakePackageConfigHelpers) # standard CMake module write_basic_package_version_file( "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake" - VERSION "${psblas_VERSION}" + VERSION "${VERSION}" COMPATIBILITY SameMajorVersion ) @@ -811,7 +851,7 @@ set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/modules) -message(STATUS "fortran module direcotry ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}") +message(STATUS "fortran module directory ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}") include_directories(${MPI_Fortran_INCLUDE_PATH}) @@ -827,6 +867,7 @@ set_target_properties(base POSITION_INDEPENDENT_CODE TRUE OUTPUT_NAME psb_base LINKER_LANGUAGE Fortran + VERSION ${VERSION} SOVERSION ${SOVERSION} ) target_include_directories(base PUBLIC @@ -859,6 +900,7 @@ set_target_properties(prec POSITION_INDEPENDENT_CODE TRUE OUTPUT_NAME psb_prec LINKER_LANGUAGE Fortran + VERSION ${VERSION} SOVERSION ${SOVERSION} ) target_include_directories(prec PUBLIC $ @@ -874,6 +916,7 @@ set_target_properties(linsolve POSITION_INDEPENDENT_CODE TRUE OUTPUT_NAME psb_linsolve LINKER_LANGUAGE Fortran + VERSION ${VERSION} SOVERSION ${SOVERSION} ) target_include_directories(linsolve PUBLIC $ @@ -890,6 +933,7 @@ set_target_properties(ext POSITION_INDEPENDENT_CODE TRUE OUTPUT_NAME psb_ext LINKER_LANGUAGE Fortran + VERSION ${VERSION} SOVERSION ${SOVERSION} ) target_include_directories(ext PUBLIC $ @@ -909,7 +953,8 @@ if(WIN32) set_target_properties(psb_util_C PROPERTIES LINKER_LANGUAGE C - POSITION_INDEPENDENT_CODE TRUE) + POSITION_INDEPENDENT_CODE TRUE + VERSION ${VERSION} SOVERSION ${SOVERSION}) target_link_libraries(psb_util_C PUBLIC kernel32 user32 shell32) endif() @@ -935,6 +980,7 @@ set_target_properties(util POSITION_INDEPENDENT_CODE TRUE OUTPUT_NAME psb_util LINKER_LANGUAGE Fortran + VERSION ${VERSION} SOVERSION ${SOVERSION} ) target_include_directories(util PUBLIC $ @@ -995,6 +1041,7 @@ set_target_properties(cbind POSITION_INDEPENDENT_CODE TRUE OUTPUT_NAME psb_cbind LINKER_LANGUAGE Fortran + VERSION ${VERSION} SOVERSION ${SOVERSION} ) #target_include_directories(cbind PUBLIC # $ @@ -1141,6 +1188,7 @@ if(PSB_BUILD_CUDA) PROPERTIES POSITION_INDEPENDENT_CODE TRUE OUTPUT_NAME psb_cuda + VERSION ${VERSION} SOVERSION ${SOVERSION} LINKER_LANGUAGE C) # Include directories for the CUDA library diff --git a/LICENSE b/LICENSE index a05485c3e..9aaec1626 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,5 @@ - Parallel Sparse BLAS version 3.9 - (C) Copyright 2006-2025 - Salvatore Filippone - Alfredo Buttari + (C) Copyright 2025 Salvatore Filippone + (C) Copyright 2025 Alfredo Buttari Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -13,7 +11,7 @@ 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. + software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index ebac7d333..ec1ff4db8 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -1,9 +1,9 @@ set(PSB_base_source_files comm/psb_dovrl_a.f90 comm/psb_dovrl.f90 -# comm/psb_i2halo_a.f90 + comm/psb_i2halo_a.f90 comm/internals/psi_zswaptran.F90 -# comm/internals/psi_i2ovrl_upd_a.f90 + comm/internals/psi_i2ovrl_upd_a.f90 comm/internals/psi_lovrl_save.f90 comm/internals/psi_movrl_save_a.f90 comm/internals/psi_sovrl_restr_a.f90 @@ -17,7 +17,7 @@ set(PSB_base_source_files comm/internals/psi_dswapdata_a.F90 comm/internals/psi_movrl_upd_a.f90 modules/comm/comm_schemes/psb_comm_rma_mod.F90 -# comm/internals/psi_i2swaptran_a.F90 + comm/internals/psi_i2swaptran_a.F90 comm/internals/psi_dswaptran.F90 comm/internals/psi_covrl_save_a.f90 comm/internals/psi_eovrl_restr_a.f90 @@ -32,7 +32,7 @@ set(PSB_base_source_files comm/internals/psi_sswaptran.F90 comm/internals/psi_lswaptran.F90 comm/internals/psi_mswaptran_a.F90 -# comm/internals/psi_i2ovrl_restr_a.f90 + comm/internals/psi_i2ovrl_restr_a.f90 comm/internals/psi_covrl_restr.f90 comm/internals/psi_mswapdata_a.F90 comm/internals/psi_zovrl_restr_a.f90 @@ -50,14 +50,14 @@ set(PSB_base_source_files comm/internals/psi_zswapdata_a.F90 comm/internals/psi_dovrl_save.f90 comm/internals/psi_covrl_save.f90 -# comm/internals/psi_i2swapdata_a.F90 + comm/internals/psi_i2swapdata_a.F90 comm/internals/psi_dovrl_upd.f90 comm/internals/psi_eovrl_save_a.f90 comm/internals/psi_zovrl_upd_a.f90 comm/internals/psi_zswapdata.F90 comm/internals/psi_covrl_upd.f90 comm/internals/psi_cswaptran.F90 -# comm/internals/psi_i2ovrl_save_a.f90 + comm/internals/psi_i2ovrl_save_a.f90 comm/internals/psi_sovrl_upd.f90 comm/internals/psi_eswapdata_a.F90 comm/internals/psi_movrl_restr_a.f90 @@ -83,9 +83,9 @@ set(PSB_base_source_files comm/psb_zhalo.f90 comm/psb_movrl_a.f90 comm/psb_chalo_a.f90 -# comm/psb_i2scatter_a.F90 + comm/psb_i2scatter_a.F90 comm/psb_sgather_a.f90 -# comm/psb_i2ovrl_a.f90 + comm/psb_i2ovrl_a.f90 comm/psb_zovrl_a.f90 comm/psb_covrl.f90 comm/psb_shalo.f90 @@ -101,7 +101,7 @@ set(PSB_base_source_files comm/psb_zhalo_a.f90 comm/psb_sscatter_a.F90 comm/psb_lscatter.F90 -# comm/psb_i2gather_a.f90 + comm/psb_i2gather_a.f90 comm/psb_ihalo.f90 comm/psb_iovrl.f90 comm/psb_zspgather.F90 @@ -145,7 +145,7 @@ set(PSB_base_source_files tools/psb_sins.f90 tools/psb_zspasb.f90 tools/psb_zspalloc.f90 -# tools/psb_i2_remote_vect.F90 + tools/psb_i2_remote_vect.F90 tools/psb_sfree_a.f90 tools/psb_cdprt.f90 tools/psb_c_glob_transpose.F90 @@ -161,7 +161,7 @@ set(PSB_base_source_files tools/psb_zallc_a.f90 tools/psb_d_map.f90 tools/psb_lfree.f90 -# tools/psb_i2ins_a.f90 + tools/psb_i2ins_a.f90 tools/psb_s_remap.F90 tools/psb_cspalloc.f90 tools/psb_glob_to_loc.f90 @@ -178,9 +178,9 @@ set(PSB_base_source_files tools/psb_sgetelem.f90 tools/psb_cspfree.f90 tools/psb_cins.f90 -# tools/psb_i2free_a.f90 + tools/psb_i2free_a.f90 tools/psb_dspins.F90 -# tools/psb_i2asb_a.f90 + tools/psb_i2asb_a.f90 tools/psb_dsphalo.F90 tools/psb_d_glob_transpose.F90 tools/psb_c_par_csr_spspmm.f90 @@ -266,7 +266,7 @@ set(PSB_base_source_files tools/psb_zspins.F90 tools/psb_zins_a.f90 tools/psb_cdcpy.F90 -# tools/psb_i2allc_a.f90 + tools/psb_i2allc_a.f90 tools/psb_dallc.f90 tools/psb_cd_renum_block.F90 tools/psb_dasb_a.f90 @@ -352,7 +352,7 @@ set(PSB_base_source_files serial/psb_ssymbmm.f90 serial/psb_cgeprt.f90 serial/psb_sgeprt.f90 -# serial/psi_i2_serial_impl.F90 + serial/psi_i2_serial_impl.F90 serial/psi_e_serial_impl.F90 serial/psb_zsymbmm.f90 serial/psb_cspspmm.F90 @@ -431,11 +431,12 @@ set(PSB_base_source_files psblas/psb_cinv_vect.f90 psblas/psb_zasum.f90 modules/comm/psi_z_comm_v_mod.f90 -# modules/comm/psb_i2_comm_a_mod.f90 - modules/comm/psb_m_comm_a_mod.f90 + modules/comm/psb_m_comm_a_mod.f90 modules/comm/psb_z_linmap_mod.f90 modules/comm/psi_s_comm_a_mod.f90 -# modules/comm/psi_i2_comm_a_mod.f90 + modules/comm/psb_i2_comm_a_mod.f90 + modules/comm/psi_i2_comm_a_mod.f90 + modules/comm/psi_i2_comm_v_mod.f90 modules/comm/psi_m_comm_a_mod.f90 modules/comm/psi_l_comm_v_mod.f90 modules/comm/psb_comm_mod.F90 @@ -463,7 +464,7 @@ set(PSB_base_source_files modules/comm/psb_linmap_mod.f90 modules/comm/psb_z_comm_a_mod.f90 modules/comm/psi_c_comm_a_mod.f90 -# modules/auxil/psb_i2_isort_mod.f90 + modules/auxil/psb_i2_isort_mod.f90 modules/auxil/psb_z_ip_reord_mod.F90 modules/auxil/psi_s_serial_mod.f90 modules/auxil/psb_s_hsort_x_mod.f90 @@ -471,7 +472,7 @@ set(PSB_base_source_files modules/auxil/psb_d_hsort_mod.f90 modules/auxil/psi_alcx_mod.f90 modules/auxil/psb_e_ip_reord_mod.F90 -# modules/auxil/psb_i2_msort_mod.f90 + modules/auxil/psb_i2_msort_mod.f90 modules/auxil/psb_rb_idx_tree_mod.f90 modules/auxil/psb_m_isort_mod.f90 modules/auxil/psb_e_msort_mod.f90 @@ -490,14 +491,15 @@ set(PSB_base_source_files modules/auxil/psb_z_isort_mod.f90 modules/auxil/psb_e_hsort_mod.f90 modules/auxil/psi_m_serial_mod.f90 -# modules/auxil/psi_i2_serial_mod.f90 + modules/auxil/psi_i2_serial_mod.f90 + modules/auxil/psb_i2_hsort_x_mod.f90 modules/auxil/psb_s_isort_mod.f90 modules/auxil/psb_e_realloc_mod.F90 modules/auxil/psb_c_hsort_mod.f90 modules/auxil/psb_z_msort_mod.f90 modules/auxil/psi_d_serial_mod.f90 modules/auxil/psb_z_qsort_mod.f90 -# modules/auxil/psb_i2_hsort_mod.f90 + modules/auxil/psb_i2_hsort_mod.f90 modules/auxil/psb_m_msort_mod.f90 modules/auxil/psb_m_ip_reord_mod.F90 modules/auxil/psb_string_mod.f90 @@ -510,14 +512,14 @@ set(PSB_base_source_files modules/auxil/psb_m_hsort_mod.f90 modules/auxil/psb_z_realloc_mod.F90 modules/auxil/psb_z_rb_idx_tree_mod.f90 -# modules/auxil/psb_i2_ip_reord_mod.F90 -# modules/auxil/psb_i2_realloc_mod.F90 + modules/auxil/psb_i2_ip_reord_mod.F90 + modules/auxil/psb_i2_realloc_mod.F90 modules/auxil/psb_s_rb_idx_tree_mod.f90 modules/auxil/psb_c_hsort_x_mod.f90 modules/auxil/psb_s_ip_reord_mod.F90 modules/auxil/psb_d_isort_mod.f90 modules/auxil/psi_z_serial_mod.f90 -# modules/auxil/psb_i2_qsort_mod.f90 + modules/auxil/psb_i2_qsort_mod.f90 modules/auxil/psb_d_msort_mod.f90 modules/auxil/psb_c_qsort_mod.f90 modules/auxil/psb_z_hsort_x_mod.f90 @@ -534,7 +536,7 @@ set(PSB_base_source_files modules/psi_l_mod.F90 modules/penv/psi_d_collective_mod.F90 modules/penv/psi_m_p2p_mod.F90 -# modules/penv/psi_i2_collective_mod.F90 + modules/penv/psi_i2_collective_mod.F90 modules/penv/psi_s_p2p_mod.F90 modules/penv/psi_e_p2p_mod.F90 modules/penv/psi_m_collective_mod.F90 @@ -544,7 +546,7 @@ set(PSB_base_source_files modules/penv/psi_z_p2p_mod.F90 modules/penv/psi_c_collective_mod.F90 modules/penv/psi_collective_mod.F90 -# modules/penv/psi_i2_p2p_mod.F90 + modules/penv/psi_i2_p2p_mod.F90 modules/penv/psi_c_p2p_mod.F90 modules/penv/psi_e_collective_mod.F90 modules/penv/psi_z_collective_mod.F90 @@ -563,7 +565,7 @@ set(PSB_base_source_files modules/tools/psb_d_tools_mod.F90 modules/tools/psb_c_tools_mod.F90 modules/tools/psb_e_tools_a_mod.f90 -# modules/tools/psb_i2_tools_a_mod.f90 + modules/tools/psb_i2_tools_a_mod.f90 modules/tools/psb_c_tools_a_mod.f90 modules/tools/psb_z_tools_mod.F90 modules/tools/psb_l_tools_mod.F90 @@ -589,6 +591,7 @@ set(PSB_base_source_files modules/serial/psb_s_base_mat_mod.F90 modules/serial/psb_base_mat_mod.F90 modules/serial/psb_i_base_vect_mod.F90 + modules/serial/psb_i2_base_vect_mod.F90 modules/serial/psb_s_vect_mod.F90 modules/serial/psb_s_base_vect_mod.F90 modules/serial/psb_d_base_vect_mod.F90 @@ -597,7 +600,8 @@ set(PSB_base_source_files modules/serial/psb_c_vect_mod.F90 modules/serial/psb_d_mat_mod.F90 modules/serial/psb_s_mat_mod.F90 - modules/serial/psb_i_vect_mod.F90 + modules/serial/psb_i2_vect_mod.F90 + modules/serial/psb_i_vect_mod.F90 modules/serial/psb_d_vect_mod.F90 modules/serial/psb_c_base_vect_mod.F90 modules/serial/psb_vect_mod.f90 @@ -617,6 +621,7 @@ set(PSB_base_source_files modules/psb_penv_mod.F90 modules/psb_error_mod.F90 modules/psb_timers_mod.f90 + modules/psi_i2_mod.F90 modules/psi_i_mod.F90 modules/psi_z_mod.F90 modules/desc/psb_desc_const_mod.f90 diff --git a/base/auxil/psi_a2a_fnd_owner.F90 b/base/auxil/psi_a2a_fnd_owner.F90 index 3fca7f4a9..91aa146cb 100644 --- a/base/auxil/psi_a2a_fnd_owner.F90 +++ b/base/auxil/psi_a2a_fnd_owner.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_adjcncy_fnd_owner.F90 b/base/auxil/psi_adjcncy_fnd_owner.F90 index 3ac830d75..3ee5b3e49 100644 --- a/base/auxil/psi_adjcncy_fnd_owner.F90 +++ b/base/auxil/psi_adjcncy_fnd_owner.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_bld_glb_dep_list.F90 b/base/auxil/psi_bld_glb_dep_list.F90 index ea5349c4e..bd7337b28 100644 --- a/base/auxil/psi_bld_glb_dep_list.F90 +++ b/base/auxil/psi_bld_glb_dep_list.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_bld_tmphalo.f90 b/base/auxil/psi_bld_tmphalo.f90 index d1ee62c69..b9e07dfae 100644 --- a/base/auxil/psi_bld_tmphalo.f90 +++ b/base/auxil/psi_bld_tmphalo.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_bld_tmpovrl.f90 b/base/auxil/psi_bld_tmpovrl.f90 index 1952b9eb4..4c3c823fa 100644 --- a/base/auxil/psi_bld_tmpovrl.f90 +++ b/base/auxil/psi_bld_tmpovrl.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_compute_size.f90 b/base/auxil/psi_compute_size.f90 index 1820cfecb..85de7cc4f 100644 --- a/base/auxil/psi_compute_size.f90 +++ b/base/auxil/psi_compute_size.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_crea_bnd_elem.f90 b/base/auxil/psi_crea_bnd_elem.f90 index d537dc296..08cd578e3 100644 --- a/base/auxil/psi_crea_bnd_elem.f90 +++ b/base/auxil/psi_crea_bnd_elem.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_crea_index.f90 b/base/auxil/psi_crea_index.f90 index bbef054ed..d865d6b5c 100644 --- a/base/auxil/psi_crea_index.f90 +++ b/base/auxil/psi_crea_index.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_crea_ovr_elem.f90 b/base/auxil/psi_crea_ovr_elem.f90 index bf9eeee4d..22c56672e 100644 --- a/base/auxil/psi_crea_ovr_elem.f90 +++ b/base/auxil/psi_crea_ovr_elem.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_desc_impl.f90 b/base/auxil/psi_desc_impl.f90 index a6859678b..5743f97bc 100644 --- a/base/auxil/psi_desc_impl.f90 +++ b/base/auxil/psi_desc_impl.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_desc_index.F90 b/base/auxil/psi_desc_index.F90 index 169b7a3e6..338b860de 100644 --- a/base/auxil/psi_desc_index.F90 +++ b/base/auxil/psi_desc_index.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_fnd_owner.F90 b/base/auxil/psi_fnd_owner.F90 index 2ba747886..47ecc3573 100644 --- a/base/auxil/psi_fnd_owner.F90 +++ b/base/auxil/psi_fnd_owner.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_graph_fnd_owner.F90 b/base/auxil/psi_graph_fnd_owner.F90 index 56d4f5dd2..b748d24c1 100644 --- a/base/auxil/psi_graph_fnd_owner.F90 +++ b/base/auxil/psi_graph_fnd_owner.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_hash_impl.f90 b/base/auxil/psi_hash_impl.f90 index ed650e624..685f89e72 100644 --- a/base/auxil/psi_hash_impl.f90 +++ b/base/auxil/psi_hash_impl.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_indx_map_fnd_owner.F90 b/base/auxil/psi_indx_map_fnd_owner.F90 index e45c6a761..593c93564 100644 --- a/base/auxil/psi_indx_map_fnd_owner.F90 +++ b/base/auxil/psi_indx_map_fnd_owner.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_sort_dl.f90 b/base/auxil/psi_sort_dl.f90 index a5c0b3749..1cef53184 100644 --- a/base/auxil/psi_sort_dl.f90 +++ b/base/auxil/psi_sort_dl.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_srtlist.f90 b/base/auxil/psi_srtlist.f90 index 375dc8857..fb72d8f6a 100644 --- a/base/auxil/psi_srtlist.f90 +++ b/base/auxil/psi_srtlist.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_symm_dep_list.F90 b/base/auxil/psi_symm_dep_list.F90 index f88eda91d..e88185cea 100644 --- a/base/auxil/psi_symm_dep_list.F90 +++ b/base/auxil/psi_symm_dep_list.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/auxil/psi_xtr_loc_dl.F90 b/base/auxil/psi_xtr_loc_dl.F90 index 26751dc9c..09f5d3c7b 100644 --- a/base/auxil/psi_xtr_loc_dl.F90 +++ b/base/auxil/psi_xtr_loc_dl.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/Makefile b/base/comm/Makefile index dfa1bed8b..b7fcdeeab 100644 --- a/base/comm/Makefile +++ b/base/comm/Makefile @@ -8,6 +8,7 @@ OBJS = psb_dgather.o psb_dhalo.o psb_dovrl.o \ psb_zgather.o psb_zhalo.o psb_zovrl.o \ psb_dgather_a.o psb_dhalo_a.o psb_dovrl_a.o \ psb_sgather_a.o psb_shalo_a.o psb_sovrl_a.o \ + psb_i2gather_a.o psb_i2halo_a.o psb_i2ovrl_a.o \ psb_mgather_a.o psb_mhalo_a.o psb_movrl_a.o \ psb_egather_a.o psb_ehalo_a.o psb_eovrl_a.o \ psb_cgather_a.o psb_chalo_a.o psb_covrl_a.o \ @@ -18,7 +19,7 @@ MPFOBJS=psb_dscatter.o psb_zscatter.o \ psb_iscatter.o psb_lscatter.o \ psb_cscatter.o psb_sscatter.o \ psb_dscatter_a.o psb_zscatter_a.o \ - psb_mscatter_a.o psb_escatter_a.o \ + psb_mscatter_a.o psb_escatter_a.o psb_i2scatter_a.o \ psb_cscatter_a.o psb_sscatter_a.o \ psb_dspgather.o psb_sspgather.o \ psb_zspgather.o psb_cspgather.o diff --git a/base/comm/internals/Makefile b/base/comm/internals/Makefile index 2d0278f67..a896a4d9b 100644 --- a/base/comm/internals/Makefile +++ b/base/comm/internals/Makefile @@ -6,6 +6,7 @@ FOBJS = psi_iovrl_restr.o psi_iovrl_save.o psi_iovrl_upd.o \ psi_dovrl_restr.o psi_dovrl_save.o psi_dovrl_upd.o \ psi_covrl_restr.o psi_covrl_save.o psi_covrl_upd.o \ psi_zovrl_restr.o psi_zovrl_save.o psi_zovrl_upd.o \ + psi_i2ovrl_restr_a.o psi_i2ovrl_save_a.o psi_i2ovrl_upd_a.o \ psi_movrl_restr_a.o psi_movrl_save_a.o psi_movrl_upd_a.o \ psi_eovrl_restr_a.o psi_eovrl_save_a.o psi_eovrl_upd_a.o \ psi_sovrl_restr_a.o psi_sovrl_save_a.o psi_sovrl_upd_a.o \ @@ -21,6 +22,7 @@ MPFOBJS = psi_dswapdata.o psi_dswaptran.o\ psi_zswapdata.o psi_zswaptran.o \ psi_dswapdata_a.o psi_dswaptran_a.o \ psi_sswapdata_a.o psi_sswaptran_a.o \ + psi_i2swapdata_a.o psi_i2swaptran_a.o \ psi_mswapdata_a.o psi_mswaptran_a.o \ psi_eswapdata_a.o psi_eswaptran_a.o \ psi_cswapdata_a.o psi_cswaptran_a.o \ @@ -37,8 +39,8 @@ lib: objs $(RANLIB) $(LIBDIR)/$(LIBNAME) $(FOBJS) $(FBOJS2): $(MODDIR)/psi_mod.o -mpfobjs: - (make $(MPFOBJS) FC="$(MPFC)" ) +mpfobjs: $(MODDIR)/psi_mod.o + (make $(MPFOBJS) FC="$(MPFC)" ) clean: /bin/rm -f $(MPFOBJS) $(FOBJS) $(COBJS) $(FOBJS2) $(MPFOBJS2) *$(.mod) *.smod diff --git a/base/comm/internals/psi_cswapdata.F90 b/base/comm/internals/psi_cswapdata.F90 index f11f9b9e4..f008b2b46 100644 --- a/base/comm/internals/psi_cswapdata.F90 +++ b/base/comm/internals/psi_cswapdata.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_cswapdata_a.F90 b/base/comm/internals/psi_cswapdata_a.F90 index cab18b2be..726ee872a 100644 --- a/base/comm/internals/psi_cswapdata_a.F90 +++ b/base/comm/internals/psi_cswapdata_a.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_cswaptran.F90 b/base/comm/internals/psi_cswaptran.F90 index a030bbe17..13d42e9d3 100644 --- a/base/comm/internals/psi_cswaptran.F90 +++ b/base/comm/internals/psi_cswaptran.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_cswaptran_a.F90 b/base/comm/internals/psi_cswaptran_a.F90 index 03f511975..8391761de 100644 --- a/base/comm/internals/psi_cswaptran_a.F90 +++ b/base/comm/internals/psi_cswaptran_a.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_dswapdata.F90 b/base/comm/internals/psi_dswapdata.F90 index e2516df29..02db23d84 100644 --- a/base/comm/internals/psi_dswapdata.F90 +++ b/base/comm/internals/psi_dswapdata.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_dswapdata_a.F90 b/base/comm/internals/psi_dswapdata_a.F90 index fae1a7119..f5a8bcf9b 100644 --- a/base/comm/internals/psi_dswapdata_a.F90 +++ b/base/comm/internals/psi_dswapdata_a.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_dswaptran.F90 b/base/comm/internals/psi_dswaptran.F90 index 6046591b9..31fb1e0cf 100644 --- a/base/comm/internals/psi_dswaptran.F90 +++ b/base/comm/internals/psi_dswaptran.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_dswaptran_a.F90 b/base/comm/internals/psi_dswaptran_a.F90 index e8e991e4b..458c34099 100644 --- a/base/comm/internals/psi_dswaptran_a.F90 +++ b/base/comm/internals/psi_dswaptran_a.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_eswapdata_a.F90 b/base/comm/internals/psi_eswapdata_a.F90 index 122863ae6..f1a1fd602 100644 --- a/base/comm/internals/psi_eswapdata_a.F90 +++ b/base/comm/internals/psi_eswapdata_a.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_eswaptran_a.F90 b/base/comm/internals/psi_eswaptran_a.F90 index 0c3f0c248..7cd94cdbe 100644 --- a/base/comm/internals/psi_eswaptran_a.F90 +++ b/base/comm/internals/psi_eswaptran_a.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_i2swapdata_a.F90 b/base/comm/internals/psi_i2swapdata_a.F90 index e8713aa3f..99c48fdcc 100644 --- a/base/comm/internals/psi_i2swapdata_a.F90 +++ b/base/comm/internals/psi_i2swapdata_a.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_i2swaptran_a.F90 b/base/comm/internals/psi_i2swaptran_a.F90 index f04e7a2b4..729f3df16 100644 --- a/base/comm/internals/psi_i2swaptran_a.F90 +++ b/base/comm/internals/psi_i2swaptran_a.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_iswapdata.F90 b/base/comm/internals/psi_iswapdata.F90 index 454cc9917..98fca246f 100644 --- a/base/comm/internals/psi_iswapdata.F90 +++ b/base/comm/internals/psi_iswapdata.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_iswaptran.F90 b/base/comm/internals/psi_iswaptran.F90 index d99c7ca00..bf04fd574 100644 --- a/base/comm/internals/psi_iswaptran.F90 +++ b/base/comm/internals/psi_iswaptran.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_lswapdata.F90 b/base/comm/internals/psi_lswapdata.F90 index bbc689468..7eddab1ce 100644 --- a/base/comm/internals/psi_lswapdata.F90 +++ b/base/comm/internals/psi_lswapdata.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_lswaptran.F90 b/base/comm/internals/psi_lswaptran.F90 index 818dedaf8..a7a808555 100644 --- a/base/comm/internals/psi_lswaptran.F90 +++ b/base/comm/internals/psi_lswaptran.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_mswapdata_a.F90 b/base/comm/internals/psi_mswapdata_a.F90 index 335df8ed3..af6f8cdc3 100644 --- a/base/comm/internals/psi_mswapdata_a.F90 +++ b/base/comm/internals/psi_mswapdata_a.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_mswaptran_a.F90 b/base/comm/internals/psi_mswaptran_a.F90 index 051209e70..35e5eec49 100644 --- a/base/comm/internals/psi_mswaptran_a.F90 +++ b/base/comm/internals/psi_mswaptran_a.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_sswapdata.F90 b/base/comm/internals/psi_sswapdata.F90 index 4ccde00b5..e7bbaae70 100644 --- a/base/comm/internals/psi_sswapdata.F90 +++ b/base/comm/internals/psi_sswapdata.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_sswapdata_a.F90 b/base/comm/internals/psi_sswapdata_a.F90 index 32083f3f4..7d117dc83 100644 --- a/base/comm/internals/psi_sswapdata_a.F90 +++ b/base/comm/internals/psi_sswapdata_a.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_sswaptran.F90 b/base/comm/internals/psi_sswaptran.F90 index 8c7f8e828..069b07d11 100644 --- a/base/comm/internals/psi_sswaptran.F90 +++ b/base/comm/internals/psi_sswaptran.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_sswaptran_a.F90 b/base/comm/internals/psi_sswaptran_a.F90 index d3e35e4c2..53b22426e 100644 --- a/base/comm/internals/psi_sswaptran_a.F90 +++ b/base/comm/internals/psi_sswaptran_a.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_zswapdata.F90 b/base/comm/internals/psi_zswapdata.F90 index 62365a52f..dcc977fef 100644 --- a/base/comm/internals/psi_zswapdata.F90 +++ b/base/comm/internals/psi_zswapdata.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_zswapdata_a.F90 b/base/comm/internals/psi_zswapdata_a.F90 index d76ff7425..c7db818e5 100644 --- a/base/comm/internals/psi_zswapdata_a.F90 +++ b/base/comm/internals/psi_zswapdata_a.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_zswaptran.F90 b/base/comm/internals/psi_zswaptran.F90 index 38e821230..50ba3585e 100644 --- a/base/comm/internals/psi_zswaptran.F90 +++ b/base/comm/internals/psi_zswaptran.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/comm/internals/psi_zswaptran_a.F90 b/base/comm/internals/psi_zswaptran_a.F90 index 1c06bef10..1d7a9b74d 100644 --- a/base/comm/internals/psi_zswaptran_a.F90 +++ b/base/comm/internals/psi_zswaptran_a.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/Makefile b/base/modules/Makefile index 7ab71d300..353f64211 100644 --- a/base/modules/Makefile +++ b/base/modules/Makefile @@ -48,6 +48,7 @@ SERIAL_MODS=serial/psb_s_serial_mod.o serial/psb_d_serial_mod.o \ psi_mod.o psi_i2_mod.o psi_i_mod.o psi_l_mod.o psi_s_mod.o psi_d_mod.o psi_c_mod.o psi_z_mod.o\ auxil/psb_ip_reord_mod.o\ auxil/psi_acx_mod.o auxil/psi_alcx_mod.o auxil/psi_lcx_mod.o \ + auxil/psb_i2_ip_reord_mod.o \ auxil/psb_m_ip_reord_mod.o auxil/psb_e_ip_reord_mod.o \ auxil/psb_s_ip_reord_mod.o auxil/psb_d_ip_reord_mod.o \ auxil/psb_c_ip_reord_mod.o auxil/psb_z_ip_reord_mod.o \ @@ -65,6 +66,7 @@ SERIAL_MODS=serial/psb_s_serial_mod.o serial/psb_d_serial_mod.o \ auxil/psb_c_msort_mod.o auxil/psb_c_qsort_mod.o \ auxil/psb_z_hsort_mod.o auxil/psb_z_isort_mod.o \ auxil/psb_z_msort_mod.o auxil/psb_z_qsort_mod.o \ + auxil/psb_i2_hsort_x_mod.o \ auxil/psb_i_hsort_x_mod.o \ auxil/psb_l_hsort_x_mod.o \ auxil/psb_s_hsort_x_mod.o \ @@ -94,7 +96,7 @@ UTIL_MODS = desc/psb_desc_const_mod.o desc/psb_indx_map_mod.o\ tools/psb_i_tools_mod.o tools/psb_l_tools_mod.o \ tools/psb_s_tools_mod.o tools/psb_d_tools_mod.o\ tools/psb_c_tools_mod.o tools/psb_z_tools_mod.o \ - tools/psb_m_tools_a_mod.o tools/psb_e_tools_a_mod.o \ + tools/psb_i2_tools_a_mod.o tools/psb_m_tools_a_mod.o tools/psb_e_tools_a_mod.o \ tools/psb_s_tools_a_mod.o tools/psb_d_tools_a_mod.o\ tools/psb_c_tools_a_mod.o tools/psb_z_tools_a_mod.o \ tools/psb_tools_mod.o \ @@ -192,6 +194,7 @@ penv/psi_d_collective_mod.o penv/psi_c_collective_mod.o penv/psi_z_collective_m auxil/psi_acx_mod.o auxil/psi_alcx_mod.o auxil/psi_lcx_mod.o \ auxil/psb_string_mod.o auxil/psb_i2_realloc_mod.o auxil/psb_m_realloc_mod.o auxil/psb_e_realloc_mod.o \ +auxil/psb_s_realloc_mod.o \ auxil/psb_d_realloc_mod.o auxil/psb_c_realloc_mod.o auxil/psb_z_realloc_mod.o \ desc/psb_desc_const_mod.o psi_penv_mod.o: psb_const_mod.o @@ -226,6 +229,7 @@ auxil/psb_sort_mod.o: auxil/psb_m_hsort_mod.o auxil/psb_m_isort_mod.o \ auxil/psb_c_msort_mod.o auxil/psb_c_qsort_mod.o \ auxil/psb_z_hsort_mod.o auxil/psb_z_isort_mod.o \ auxil/psb_z_msort_mod.o auxil/psb_z_qsort_mod.o \ + auxil/psb_i2_hsort_x_mod.o \ auxil/psb_i_hsort_x_mod.o \ auxil/psb_l_hsort_x_mod.o \ auxil/psb_s_hsort_x_mod.o \ @@ -249,18 +253,20 @@ auxil/psb_c_hsort_mod.o auxil/psb_c_isort_mod.o \ auxil/psb_c_msort_mod.o auxil/psb_c_qsort_mod.o \ auxil/psb_z_hsort_mod.o auxil/psb_z_isort_mod.o \ auxil/psb_z_msort_mod.o auxil/psb_z_qsort_mod.o \ +auxil/psb_i2_hsort_x_mod.o \ auxil/psb_i_hsort_x_mod.o \ auxil/psb_l_hsort_x_mod.o \ auxil/psb_s_hsort_x_mod.o \ auxil/psb_d_hsort_x_mod.o \ auxil/psb_c_hsort_x_mod.o \ auxil/psb_z_hsort_x_mod.o \ -auxil/psb_m_ip_reord_mod.o auxil/psb_e_ip_reord_mod.o \ +auxil/psb_i2_ip_reord_mod.o auxil/psb_m_ip_reord_mod.o auxil/psb_e_ip_reord_mod.o \ auxil/psb_s_ip_reord_mod.o auxil/psb_d_ip_reord_mod.o \ auxil/psb_c_ip_reord_mod.o auxil/psb_z_ip_reord_mod.o : psb_realloc_mod.o psb_const_mod.o auxil/psb_i2_hsort_x_mod.o: auxil/psb_m_hsort_mod.o auxil/psb_e_hsort_mod.o auxil/psb_i2_hsort_mod.o auxil/psb_i_hsort_x_mod.o: auxil/psb_m_hsort_mod.o auxil/psb_e_hsort_mod.o auxil/psb_i2_hsort_mod.o +auxil/psb_i_hsort_x_mod.o: auxil/psb_m_hsort_mod.o auxil/psb_e_hsort_mod.o auxil/psb_l_hsort_x_mod.o: auxil/psb_m_hsort_mod.o auxil/psb_e_hsort_mod.o auxil/psb_s_hsort_x_mod.o: auxil/psb_s_hsort_mod.o auxil/psb_d_hsort_x_mod.o: auxil/psb_d_hsort_mod.o @@ -274,7 +280,7 @@ auxil/psi_serial_mod.o: auxil/psi_i2_serial_mod.o auxil/psi_m_serial_mod.o auxi auxil/psi_i2_serial_mod.o auxil/psi_m_serial_mod.o auxil/psi_e_serial_mod.o auxil/psi_s_serial_mod.o auxil/psi_d_serial_mod.o auxil/psi_c_serial_mod.o auxil/psi_z_serial_mod.o: psb_const_mod.o -auxil/psb_ip_reord_mod.o: auxil/psb_m_ip_reord_mod.o auxil/psb_e_ip_reord_mod.o \ +auxil/psb_ip_reord_mod.o: auxil/psb_i2_ip_reord_mod.o auxil/psb_m_ip_reord_mod.o auxil/psb_e_ip_reord_mod.o \ auxil/psb_s_ip_reord_mod.o auxil/psb_d_ip_reord_mod.o \ auxil/psb_c_ip_reord_mod.o auxil/psb_z_ip_reord_mod.o @@ -287,8 +293,8 @@ serial/psb_s_base_mat_mod.o serial/psb_d_base_mat_mod.o serial/psb_c_base_mat_mo serial/psb_s_base_mat_mod.o: serial/psb_s_base_vect_mod.o serial/psb_d_base_mat_mod.o: serial/psb_d_base_vect_mod.o #serial/psb_ld_base_mat_mod.o: serial/psb_d_base_vect_mod.o -serial/psb_c_base_mat_mod.o: serial/psb_c_base_vect_mod.o -serial/psb_z_base_mat_mod.o: serial/psb_z_base_vect_mod.o +serial/psb_c_base_mat_mod.o: serial/psb_c_base_vect_mod.o +serial/psb_z_base_mat_mod.o: serial/psb_z_base_vect_mod.o serial/psb_i2_base_vect_mod.o: serial/psb_i_base_vect_mod.o comm/comm_schemes/psb_comm_schemes_mod.o comm/comm_schemes/psb_comm_factory_mod.o serial/psb_l_base_vect_mod.o: serial/psb_i_base_vect_mod.o comm/comm_schemes/psb_comm_schemes_mod.o comm/comm_schemes/psb_comm_factory_mod.o serial/psb_d_base_vect_mod.o serial/psb_c_base_vect_mod.o serial/psb_s_base_vect_mod.o serial/psb_z_base_vect_mod.o: serial/psb_i_base_vect_mod.o serial/psb_l_base_vect_mod.o comm/comm_schemes/psb_comm_neighbor_impl_mod.o comm/comm_schemes/psb_comm_schemes_mod.o comm/comm_schemes/psb_comm_factory_mod.o @@ -317,7 +323,7 @@ serial/psb_d_vect_mod.o: serial/psb_d_base_vect_mod.o serial/psb_i_vect_mod.o serial/psb_c_vect_mod.o: serial/psb_c_base_vect_mod.o serial/psb_i_vect_mod.o serial/psb_z_vect_mod.o: serial/psb_z_base_vect_mod.o serial/psb_i_vect_mod.o serial/psb_s_serial_mod.o serial/psb_d_serial_mod.o serial/psb_c_serial_mod.o serial/psb_z_serial_mod.o: serial/psb_mat_mod.o auxil/psb_string_mod.o auxil/psb_sort_mod.o auxil/psi_serial_mod.o -serial/psb_vect_mod.o: serial/psb_i_vect_mod.o serial/psb_l_vect_mod.o serial/psb_d_vect_mod.o serial/psb_s_vect_mod.o serial/psb_c_vect_mod.o serial/psb_z_vect_mod.o +serial/psb_vect_mod.o: serial/psb_i2_vect_mod.o serial/psb_i_vect_mod.o serial/psb_l_vect_mod.o serial/psb_d_vect_mod.o serial/psb_s_vect_mod.o serial/psb_c_vect_mod.o serial/psb_z_vect_mod.o auxil/psb_s_rb_idx_tree_mod.o: serial/psb_s_csr_mat_mod.o psb_realloc_mod.o auxil/psb_d_rb_idx_tree_mod.o: serial/psb_d_csr_mat_mod.o psb_realloc_mod.o @@ -371,7 +377,7 @@ comm/psb_c_linmap_mod.o: comm/psb_base_linmap_mod.o serial/psb_c_mat_mod.o seria comm/psb_z_linmap_mod.o: comm/psb_base_linmap_mod.o serial/psb_z_mat_mod.o serial/psb_z_vect_mod.o comm/psb_base_linmap_mod.o: desc/psb_desc_mod.o serial/psb_serial_mod.o comm/psb_comm_mod.o comm/psb_comm_mod.o: desc/psb_desc_mod.o serial/psb_mat_mod.o -comm/psb_comm_mod.o: comm/psb_i_comm_mod.o comm/psb_l_comm_mod.o \ +comm/psb_comm_mod.o: comm/psb_i2_comm_mod.o comm/psb_i_comm_mod.o comm/psb_l_comm_mod.o \ comm/psb_s_comm_mod.o comm/psb_d_comm_mod.o \ comm/psb_c_comm_mod.o comm/psb_z_comm_mod.o \ comm/psb_i2_comm_a_mod.o \ @@ -383,7 +389,8 @@ comm/psb_i2_comm_a_mod.o comm/psb_m_comm_a_mod.o comm/psb_e_comm_a_mod.o \ comm/psb_s_comm_a_mod.o comm/psb_d_comm_a_mod.o\ comm/psb_c_comm_a_mod.o comm/psb_z_comm_a_mod.o: desc/psb_desc_mod.o -comm/psb_i_comm_mod.o: serial/psb_i_vect_mod.o desc/psb_desc_mod.o +comm/psb_i2_comm_mod.o: serial/psb_i2_vect_mod.o desc/psb_desc_mod.o +comm/psb_i_comm_mod.o: serial/psb_i_vect_mod.o desc/psb_desc_mod.o comm/psb_l_comm_mod.o: serial/psb_l_vect_mod.o desc/psb_desc_mod.o comm/psb_s_comm_mod.o: serial/psb_s_vect_mod.o desc/psb_desc_mod.o serial/psb_mat_mod.o comm/psb_d_comm_mod.o: serial/psb_d_vect_mod.o desc/psb_desc_mod.o serial/psb_mat_mod.o @@ -408,14 +415,15 @@ comm/psi_c_comm_a_mod.o comm/psi_z_comm_a_mod.o: desc/psb_desc_mod.o tools/psb_tools_mod.o: tools/psb_cd_tools_mod.o tools/psb_s_tools_mod.o tools/psb_d_tools_mod.o\ tools/psb_i_tools_mod.o tools/psb_l_tools_mod.o \ tools/psb_c_tools_mod.o tools/psb_z_tools_mod.o \ - tools/psb_m_tools_a_mod.o tools/psb_e_tools_a_mod.o \ + tools/psb_i2_tools_a_mod.o tools/psb_m_tools_a_mod.o tools/psb_e_tools_a_mod.o \ tools/psb_s_tools_a_mod.o tools/psb_d_tools_a_mod.o\ tools/psb_c_tools_a_mod.o tools/psb_z_tools_a_mod.o tools/psb_cd_tools_mod.o tools/psb_i_tools_mod.o tools/psb_l_tools_mod.o \ tools/psb_s_tools_mod.o tools/psb_d_tools_mod.o \ -tools/psb_c_tools_mod.o tools/psb_z_tools_mod.o tools/psb_m_tools_a_mod.o tools/psb_e_tools_a_mod.o \ +tools/psb_c_tools_mod.o tools/psb_z_tools_mod.o \ +tools/psb_i2_tools_a_mod.o tools/psb_m_tools_a_mod.o tools/psb_e_tools_a_mod.o \ tools/psb_s_tools_a_mod.o tools/psb_d_tools_a_mod.o\ tools/psb_c_tools_a_mod.o tools/psb_z_tools_a_mod.o: desc/psb_desc_mod.o psi_mod.o serial/psb_mat_mod.o diff --git a/base/modules/auxil/psb_ip_reord_mod.F90 b/base/modules/auxil/psb_ip_reord_mod.F90 index 6728c5181..36a3fb7ff 100644 --- a/base/modules/auxil/psb_ip_reord_mod.F90 +++ b/base/modules/auxil/psb_ip_reord_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -37,6 +37,7 @@ ! ! module psb_ip_reord_mod + use psb_i2_ip_reord_mod use psb_m_ip_reord_mod use psb_e_ip_reord_mod use psb_s_ip_reord_mod diff --git a/base/modules/auxil/psb_rb_idx_tree_mod.f90 b/base/modules/auxil/psb_rb_idx_tree_mod.f90 index 074255eaa..6aa685922 100644 --- a/base/modules/auxil/psb_rb_idx_tree_mod.f90 +++ b/base/modules/auxil/psb_rb_idx_tree_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/auxil/psb_sort_mod.f90 b/base/modules/auxil/psb_sort_mod.f90 index e980dc2b0..17b6271b9 100644 --- a/base/modules/auxil/psb_sort_mod.f90 +++ b/base/modules/auxil/psb_sort_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -46,7 +46,12 @@ module psb_sort_mod use psb_const_mod use psb_ip_reord_mod use psi_serial_mod - + + use psb_i2_hsort_mod + use psb_i2_isort_mod + use psb_i2_msort_mod + use psb_i2_qsort_mod + use psb_m_hsort_mod use psb_m_isort_mod use psb_m_msort_mod @@ -77,6 +82,7 @@ module psb_sort_mod use psb_z_msort_mod use psb_z_qsort_mod + use psb_i2_hsort_x_mod use psb_i_hsort_x_mod use psb_l_hsort_x_mod use psb_s_hsort_x_mod diff --git a/base/modules/auxil/psb_string_mod.f90 b/base/modules/auxil/psb_string_mod.f90 index 72f5d870c..5c575ad89 100644 --- a/base/modules/auxil/psb_string_mod.f90 +++ b/base/modules/auxil/psb_string_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/auxil/psi_acx_mod.f90 b/base/modules/auxil/psi_acx_mod.f90 index 8150c8779..90a021f0f 100644 --- a/base/modules/auxil/psi_acx_mod.f90 +++ b/base/modules/auxil/psi_acx_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/auxil/psi_alcx_mod.f90 b/base/modules/auxil/psi_alcx_mod.f90 index c11ce8e1d..1bd83d3c6 100644 --- a/base/modules/auxil/psi_alcx_mod.f90 +++ b/base/modules/auxil/psi_alcx_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/auxil/psi_lcx_mod.f90 b/base/modules/auxil/psi_lcx_mod.f90 index 482069f0e..a876d5220 100644 --- a/base/modules/auxil/psi_lcx_mod.f90 +++ b/base/modules/auxil/psi_lcx_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/auxil/psi_serial_mod.f90 b/base/modules/auxil/psi_serial_mod.f90 index 202110528..fac8a7194 100644 --- a/base/modules/auxil/psi_serial_mod.f90 +++ b/base/modules/auxil/psi_serial_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/comm/psb_base_linmap_mod.f90 b/base/modules/comm/psb_base_linmap_mod.f90 index b06470aa6..aeb3822a3 100644 --- a/base/modules/comm/psb_base_linmap_mod.f90 +++ b/base/modules/comm/psb_base_linmap_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/comm/psb_comm_mod.f90 b/base/modules/comm/psb_comm_mod.f90 index d9fabfa9e..66d1ba770 100644 --- a/base/modules/comm/psb_comm_mod.f90 +++ b/base/modules/comm/psb_comm_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -31,6 +31,7 @@ ! module psb_comm_mod + use psb_i2_comm_a_mod use psb_m_comm_a_mod use psb_e_comm_a_mod use psb_s_comm_a_mod diff --git a/base/modules/comm/psb_linmap_mod.f90 b/base/modules/comm/psb_linmap_mod.f90 index f27926c92..036926623 100644 --- a/base/modules/comm/psb_linmap_mod.f90 +++ b/base/modules/comm/psb_linmap_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/desc/psb_desc_const_mod.f90 b/base/modules/desc/psb_desc_const_mod.f90 index eea9d7c6e..a655ec253 100644 --- a/base/modules/desc/psb_desc_const_mod.f90 +++ b/base/modules/desc/psb_desc_const_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/desc/psb_desc_mod.F90 b/base/modules/desc/psb_desc_mod.F90 index 954277917..4b109465f 100644 --- a/base/modules/desc/psb_desc_mod.F90 +++ b/base/modules/desc/psb_desc_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/desc/psb_gen_block_map_mod.F90 b/base/modules/desc/psb_gen_block_map_mod.F90 index 3b5ecfd12..cbcac3190 100644 --- a/base/modules/desc/psb_gen_block_map_mod.F90 +++ b/base/modules/desc/psb_gen_block_map_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/desc/psb_glist_map_mod.F90 b/base/modules/desc/psb_glist_map_mod.F90 index a63210134..e3a764ac9 100644 --- a/base/modules/desc/psb_glist_map_mod.F90 +++ b/base/modules/desc/psb_glist_map_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/desc/psb_hash_map_mod.F90 b/base/modules/desc/psb_hash_map_mod.F90 index 7c432b524..4c92a4a83 100644 --- a/base/modules/desc/psb_hash_map_mod.F90 +++ b/base/modules/desc/psb_hash_map_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/desc/psb_hash_mod.F90 b/base/modules/desc/psb_hash_mod.F90 index c2839cf48..f26c45c33 100644 --- a/base/modules/desc/psb_hash_mod.F90 +++ b/base/modules/desc/psb_hash_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/desc/psb_indx_map_mod.F90 b/base/modules/desc/psb_indx_map_mod.F90 index 7d7b9a075..e99bbc691 100644 --- a/base/modules/desc/psb_indx_map_mod.F90 +++ b/base/modules/desc/psb_indx_map_mod.F90 @@ -15,7 +15,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/desc/psb_list_map_mod.F90 b/base/modules/desc/psb_list_map_mod.F90 index 7b4778fbd..0a88ad84b 100644 --- a/base/modules/desc/psb_list_map_mod.F90 +++ b/base/modules/desc/psb_list_map_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/desc/psb_repl_map_mod.F90 b/base/modules/desc/psb_repl_map_mod.F90 index 2a25aef9a..e52ec9edd 100644 --- a/base/modules/desc/psb_repl_map_mod.F90 +++ b/base/modules/desc/psb_repl_map_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/error.f90 b/base/modules/error.f90 index 10cb1339f..545f4dc96 100644 --- a/base/modules/error.f90 +++ b/base/modules/error.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/penv/psi_collective_mod.F90 b/base/modules/penv/psi_collective_mod.F90 index 4ca131d4b..798947d42 100644 --- a/base/modules/penv/psi_collective_mod.F90 +++ b/base/modules/penv/psi_collective_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -31,6 +31,7 @@ ! module psi_collective_mod use psi_penv_mod + use psi_i2_collective_mod use psi_m_collective_mod use psi_e_collective_mod use psi_s_collective_mod diff --git a/base/modules/penv/psi_p2p_mod.F90 b/base/modules/penv/psi_p2p_mod.F90 index 275b5de7a..b1572a8b5 100644 --- a/base/modules/penv/psi_p2p_mod.F90 +++ b/base/modules/penv/psi_p2p_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -33,6 +33,7 @@ module psi_p2p_mod use psi_penv_mod + use psi_i2_p2p_mod use psi_m_p2p_mod use psi_e_p2p_mod use psi_s_p2p_mod diff --git a/base/modules/penv/psi_penv_mod.F90 b/base/modules/penv/psi_penv_mod.F90 index f810863c1..425a81793 100644 --- a/base/modules/penv/psi_penv_mod.F90 +++ b/base/modules/penv/psi_penv_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -1035,6 +1035,8 @@ contains ! !$ call psb_error(ctxt) ! !$ endif ! !$ endif + if (close_) call psb_clear_vect_defaults() + if (close_) call psb_clear_mat_defaults() #if defined(PSB_SERIAL_MPI) ! Under serial mode, CLOSE has no effect, but reclaim ! the used ctxt number. @@ -1045,12 +1047,6 @@ contains else call psb_close_context(psb_mesg_queue,ctxt) end if - !if ((ctxt /= mpi_comm_null).and.(ctxt /= mpi_comm_world)) then - if (allocated(ctxt%ctxt)) then - !write(0,*) ctxt%ctxt,mpi_comm_world,mpi_comm_null - if ((ctxt%ctxt /= mpi_comm_world).and.(ctxt%ctxt /= mpi_comm_null)) & - & call mpi_comm_Free(ctxt%ctxt,info) - end if if (close_) then if (info == 0) call mpi_op_free(mpi_i2amx_op,info) if (info == 0) call mpi_op_free(mpi_i2amn_op,info) @@ -1069,12 +1065,16 @@ contains if (info == 0) call mpi_op_free(mpi_snrm2_op,info) if (info == 0) call mpi_op_free(mpi_dnrm2_op,info) end if + if (allocated(ctxt%ctxt)) then +!!$ write(0,*) ctxt%ctxt,mpi_comm_world,mpi_comm_null,mpi_comm_self + if ((ctxt%ctxt /= mpi_comm_world).and.(ctxt%ctxt /= mpi_comm_null).and.& + & (ctxt%ctxt /= mpi_comm_self)) & + & call mpi_comm_Free(ctxt%ctxt,info) + end if if (close_) call mpi_finalize(info) #endif - if (close_) call psb_clear_vect_defaults() - if (close_) call psb_clear_mat_defaults() end subroutine psb_exit_mpik diff --git a/base/modules/psb_base_mod.f90 b/base/modules/psb_base_mod.f90 index 78a973b64..87cc46384 100644 --- a/base/modules/psb_base_mod.f90 +++ b/base/modules/psb_base_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/psb_cbind_const_mod.F90 b/base/modules/psb_cbind_const_mod.F90 index a976d55da..901569cc1 100644 --- a/base/modules/psb_cbind_const_mod.F90 +++ b/base/modules/psb_cbind_const_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/psb_check_mod.f90 b/base/modules/psb_check_mod.f90 index 599c7197e..e352743a1 100644 --- a/base/modules/psb_check_mod.f90 +++ b/base/modules/psb_check_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/psb_const_mod.F90 b/base/modules/psb_const_mod.F90 index 2ecdb404a..0bdb40f7d 100644 --- a/base/modules/psb_const_mod.F90 +++ b/base/modules/psb_const_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/psb_error_mod.F90 b/base/modules/psb_error_mod.F90 index a13dd97f0..086c06f2d 100644 --- a/base/modules/psb_error_mod.F90 +++ b/base/modules/psb_error_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -509,7 +509,6 @@ contains write(tmpmsg,'("PSBLAS Error (",i0,") in subroutine: ",a)')& & err_c,trim(r_name) end if - select case (err_c) case(:psb_success_) diff --git a/base/modules/psb_realloc_mod.F90 b/base/modules/psb_realloc_mod.F90 index df71bd95e..39ef9dbc2 100644 --- a/base/modules/psb_realloc_mod.F90 +++ b/base/modules/psb_realloc_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/psb_timers_mod.f90 b/base/modules/psb_timers_mod.f90 index 6bf954668..cc6fe88e2 100644 --- a/base/modules/psb_timers_mod.f90 +++ b/base/modules/psb_timers_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/psblas/psb_psblas_mod.f90 b/base/modules/psblas/psb_psblas_mod.f90 index d582c36f1..df0dc1a86 100644 --- a/base/modules/psblas/psb_psblas_mod.f90 +++ b/base/modules/psblas/psb_psblas_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/psi_mod.f90 b/base/modules/psi_mod.f90 index 55882c010..fa61a0220 100644 --- a/base/modules/psi_mod.f90 +++ b/base/modules/psi_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -36,6 +36,7 @@ module psi_mod use psb_const_mod use psb_error_mod use psb_penv_mod + use psi_i2_mod use psi_i_mod use psi_l_mod use psi_s_mod diff --git a/base/modules/serial/psb_base_mat_mod.F90 b/base/modules/serial/psb_base_mat_mod.F90 index 716d78d33..0fc1115a3 100644 --- a/base/modules/serial/psb_base_mat_mod.F90 +++ b/base/modules/serial/psb_base_mat_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/serial/psb_i2_base_vect_mod.F90 b/base/modules/serial/psb_i2_base_vect_mod.F90 index 01e665949..2393272ff 100644 --- a/base/modules/serial/psb_i2_base_vect_mod.F90 +++ b/base/modules/serial/psb_i2_base_vect_mod.F90 @@ -33,7 +33,7 @@ ! package: psb_i2_base_vect_mod ! ! This module contains the definition of the psb_i2_base_vect type which -! is a container for dense vectors.\ +! is a container for dense vectors. ! This is encapsulated instead of being just a simple array to allow for ! more complicated situations, such as GPU programming, where the memory ! area we are interested in is not easily accessible from the host/Fortran @@ -66,6 +66,7 @@ module psb_i2_base_vect_mod integer(psb_i2pk_), allocatable :: v(:) integer(psb_i2pk_), allocatable :: combuf(:) class(psb_comm_handle_type), allocatable :: comm_handle + integer(psb_mpk_), allocatable :: comid(:,:) !> vector bldstate: !! null: pristine; @@ -142,7 +143,9 @@ module psb_i2_base_vect_mod procedure, nopass :: device_wait => i2_base_device_wait procedure, pass(x) :: maybe_free_buffer => i2_base_maybe_free_buffer procedure, pass(x) :: free_buffer => i2_base_free_buffer - + procedure, pass(x) :: new_comid => i2_base_new_comid + procedure, pass(x) :: free_comid => i2_base_free_comid + ! ! Basic info procedure, pass(x) :: get_nrows => i2_base_get_nrows @@ -758,6 +761,7 @@ contains info = 0 if (allocated(x%v)) deallocate(x%v, stat=info) if ((info == 0).and.allocated(x%combuf)) call x%free_buffer(info) + if ((info == 0).and.allocated(x%comid)) call x%free_comid(info) if ((info == 0).and.allocated(x%iv)) deallocate(x%iv, stat=info) if ((info == 0).and.allocated(x%comm_handle)) then call psb_comm_free(x%comm_handle, info_comm) @@ -808,6 +812,24 @@ contains & call x%free_buffer(info) end subroutine i2_base_maybe_free_buffer + + ! + !> Function base_free_comid: + !! \memberof psb_i2_base_vect_type + !! \brief Free aux MPI communication id buffer + !! + !! \param info return code + !! + ! + subroutine i2_base_free_comid(x,info) + use psb_realloc_mod + implicit none + class(psb_i2_base_vect_type), intent(inout) :: x + integer(psb_ipk_), intent(out) :: info + + if (allocated(x%comid)) & + & deallocate(x%comid,stat=info) + end subroutine i2_base_free_comid function i2_base_get_ncfs(x) result(res) implicit none @@ -1280,6 +1302,17 @@ contains call psb_realloc(n,x%combuf,info) end subroutine i2_base_new_buffer + subroutine i2_base_new_comid(n,x,info) + use psb_realloc_mod + implicit none + class(psb_i2_base_vect_type), intent(inout) :: x + integer(psb_ipk_), intent(in) :: n + integer(psb_ipk_), intent(out) :: info + + call psb_realloc(n,2_psb_ipk_,x%comid,info) + end subroutine i2_base_new_comid + + ! ! shortcut alpha=1 beta=0 ! @@ -1394,6 +1427,7 @@ module psb_i2_base_multivect_mod integer(psb_i2pk_), allocatable :: v(:,:) integer(psb_i2pk_), allocatable :: combuf(:) class(psb_comm_handle_type), allocatable :: comm_handle + integer(psb_mpk_), allocatable :: comid(:,:) !> vector bldstate: !! null: pristine; @@ -1481,6 +1515,8 @@ module psb_i2_base_multivect_mod procedure, nopass :: device_wait => i2_base_mlv_device_wait procedure, pass(x) :: maybe_free_buffer => i2_base_mlv_maybe_free_buffer procedure, pass(x) :: free_buffer => i2_base_mlv_free_buffer + procedure, pass(x) :: new_comid => i2_base_mlv_new_comid + procedure, pass(x) :: free_comid => i2_base_mlv_free_comid ! ! Gather/scatter. These are needed for MPI interfacing. @@ -2278,6 +2314,16 @@ contains call psb_realloc(n*nc,x%combuf,info) end subroutine i2_base_mlv_new_buffer + subroutine i2_base_mlv_new_comid(n,x,info) + use psb_realloc_mod + implicit none + class(psb_i2_base_multivect_type), intent(inout) :: x + integer(psb_ipk_), intent(in) :: n + integer(psb_ipk_), intent(out) :: info + + call psb_realloc(n,2_psb_ipk_,x%comid,info) + end subroutine i2_base_mlv_new_comid + subroutine i2_base_mlv_maybe_free_buffer(x,info) use psb_realloc_mod @@ -2302,6 +2348,17 @@ contains & deallocate(x%combuf,stat=info) end subroutine i2_base_mlv_free_buffer + subroutine i2_base_mlv_free_comid(x,info) + use psb_realloc_mod + implicit none + class(psb_i2_base_multivect_type), intent(inout) :: x + integer(psb_ipk_), intent(out) :: info + + if (allocated(x%comid)) & + & deallocate(x%comid,stat=info) + end subroutine i2_base_mlv_free_comid + + ! ! Gather: Y = beta * Y + alpha * X(IDX(:)) ! diff --git a/base/modules/serial/psb_serial_mod.f90 b/base/modules/serial/psb_serial_mod.f90 index a25c1c37b..00d0db370 100644 --- a/base/modules/serial/psb_serial_mod.f90 +++ b/base/modules/serial/psb_serial_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/serial/psb_vect_mod.f90 b/base/modules/serial/psb_vect_mod.f90 index 80e7da773..d82eeffb5 100644 --- a/base/modules/serial/psb_vect_mod.f90 +++ b/base/modules/serial/psb_vect_mod.f90 @@ -1,4 +1,5 @@ module psb_vect_mod + use psb_i2_vect_mod use psb_i_vect_mod use psb_l_vect_mod use psb_s_vect_mod diff --git a/base/modules/tools/psb_cd_tools_mod.F90 b/base/modules/tools/psb_cd_tools_mod.F90 index 579b6d5fa..69f803747 100644 --- a/base/modules/tools/psb_cd_tools_mod.F90 +++ b/base/modules/tools/psb_cd_tools_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/modules/tools/psb_tools_mod.f90 b/base/modules/tools/psb_tools_mod.f90 index 7f87ee794..ca2020ee7 100644 --- a/base/modules/tools/psb_tools_mod.f90 +++ b/base/modules/tools/psb_tools_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -31,6 +31,7 @@ ! module psb_tools_mod use psb_cd_tools_mod + use psb_i2_tools_a_mod use psb_e_tools_a_mod use psb_m_tools_a_mod use psb_s_tools_a_mod diff --git a/base/psblas/psb_cvmlt.f90 b/base/psblas/psb_cvmlt.f90 index a5ee7bbcd..9cbf35180 100644 --- a/base/psblas/psb_cvmlt.f90 +++ b/base/psblas/psb_cvmlt.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/psblas/psb_dvmlt.f90 b/base/psblas/psb_dvmlt.f90 index ea76e57a0..d3c6abb59 100644 --- a/base/psblas/psb_dvmlt.f90 +++ b/base/psblas/psb_dvmlt.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/psblas/psb_svmlt.f90 b/base/psblas/psb_svmlt.f90 index a9b506c6c..0117c295c 100644 --- a/base/psblas/psb_svmlt.f90 +++ b/base/psblas/psb_svmlt.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/psblas/psb_zvmlt.f90 b/base/psblas/psb_zvmlt.f90 index a4c06fc4e..c6bebedc3 100644 --- a/base/psblas/psb_zvmlt.f90 +++ b/base/psblas/psb_zvmlt.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/serial/Makefile b/base/serial/Makefile index 57e4bfa10..7e0431aaa 100644 --- a/base/serial/Makefile +++ b/base/serial/Makefile @@ -1,7 +1,7 @@ include ../../Make.inc -FOBJS = psb_lsame.o psi_m_serial_impl.o psi_e_serial_impl.o \ +FOBJS = psb_lsame.o psi_m_serial_impl.o psi_e_serial_impl.o psi_i2_serial_impl.o \ psi_s_serial_impl.o psi_d_serial_impl.o \ psi_c_serial_impl.o psi_z_serial_impl.o \ psb_srwextd.o psb_drwextd.o psb_crwextd.o psb_zrwextd.o \ diff --git a/base/serial/impl/psb_base_mat_impl.f90 b/base/serial/impl/psb_base_mat_impl.f90 index 39e21300c..83a8e6405 100644 --- a/base/serial/impl/psb_base_mat_impl.f90 +++ b/base/serial/impl/psb_base_mat_impl.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/serial/lsmmp.f90 b/base/serial/lsmmp.f90 index 2bf2efdaa..77aadca41 100644 --- a/base/serial/lsmmp.f90 +++ b/base/serial/lsmmp.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/serial/psb_aspxpby.f90 b/base/serial/psb_aspxpby.f90 index 3ce0c61b1..6c27f231b 100644 --- a/base/serial/psb_aspxpby.f90 +++ b/base/serial/psb_aspxpby.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/serial/psb_lsame.f90 b/base/serial/psb_lsame.f90 index 887438571..d4356ed38 100644 --- a/base/serial/psb_lsame.f90 +++ b/base/serial/psb_lsame.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/serial/psb_spdot_srtd.f90 b/base/serial/psb_spdot_srtd.f90 index d0f9120f5..340af0a8c 100644 --- a/base/serial/psb_spdot_srtd.f90 +++ b/base/serial/psb_spdot_srtd.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/serial/psb_spge_dot.f90 b/base/serial/psb_spge_dot.f90 index 714971731..677cb4bb8 100644 --- a/base/serial/psb_spge_dot.f90 +++ b/base/serial/psb_spge_dot.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/serial/smmp.f90 b/base/serial/smmp.f90 index fe3ff2cc2..a8844db2d 100644 --- a/base/serial/smmp.f90 +++ b/base/serial/smmp.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/serial/sort/Makefile b/base/serial/sort/Makefile index ff8fd6201..9a4628398 100644 --- a/base/serial/sort/Makefile +++ b/base/serial/sort/Makefile @@ -3,6 +3,7 @@ include ../../../Make.inc # # The object files # +I2OBJS=psb_i2_hsort_impl.o psb_i2_isort_impl.o psb_i2_msort_impl.o psb_i2_qsort_impl.o IOBJS=psb_m_hsort_impl.o psb_m_isort_impl.o psb_m_msort_impl.o psb_m_qsort_impl.o LOBJS=psb_e_hsort_impl.o psb_e_isort_impl.o psb_e_msort_impl.o psb_e_qsort_impl.o SOBJS=psb_s_hsort_impl.o psb_s_isort_impl.o psb_s_msort_impl.o psb_s_qsort_impl.o @@ -10,7 +11,7 @@ DOBJS=psb_d_hsort_impl.o psb_d_isort_impl.o psb_d_msort_impl.o psb_d_qsort_impl. COBJS=psb_c_hsort_impl.o psb_c_isort_impl.o psb_c_msort_impl.o psb_c_qsort_impl.o ZOBJS=psb_z_hsort_impl.o psb_z_isort_impl.o psb_z_msort_impl.o psb_z_qsort_impl.o -OBJS=$(SOBJS) $(DOBJS) $(COBJS) $(ZOBJS) $(IOBJS) $(LOBJS) +OBJS=$(SOBJS) $(DOBJS) $(COBJS) $(ZOBJS) $(I2OBJS) $(IOBJS) $(LOBJS) # # Where the library should go, and how it is called. diff --git a/base/tools/Makefile b/base/tools/Makefile index 771e85fc4..1cd67af5b 100644 --- a/base/tools/Makefile +++ b/base/tools/Makefile @@ -14,6 +14,7 @@ FOBJS = psb_cdall.o psb_cdals.o psb_cdalv.o psb_cd_inloc.o psb_cdins.o psb_cdprt psb_dallc.o psb_dasb.o psb_dfree.o psb_dins.o \ psb_callc.o psb_casb.o psb_cfree.o psb_cins.o \ psb_zallc.o psb_zasb.o psb_zfree.o psb_zins.o \ + psb_i2allc_a.o psb_i2asb_a.o psb_i2free_a.o psb_i2ins_a.o \ psb_mallc_a.o psb_masb_a.o psb_mfree_a.o psb_mins_a.o \ psb_eallc_a.o psb_easb_a.o psb_efree_a.o psb_eins_a.o \ psb_sallc_a.o psb_sasb_a.o psb_sfree_a.o psb_sins_a.o \ @@ -33,7 +34,7 @@ MPFOBJS = psb_icdasb.o psb_ssphalo.o psb_dsphalo.o psb_csphalo.o psb_zsphalo.o psb_dcdbldext.o psb_zcdbldext.o psb_scdbldext.o psb_ccdbldext.o \ psb_s_remote_mat.o psb_d_remote_mat.o psb_c_remote_mat.o psb_z_remote_mat.o \ psb_s_remote_vect.o psb_d_remote_vect.o psb_c_remote_vect.o psb_z_remote_vect.o \ - psb_e_remote_vect.o psb_m_remote_vect.o + psb_e_remote_vect.o psb_m_remote_vect.o psb_i2_remote_vect.o LIBDIR=.. INCDIR=.. diff --git a/base/tools/psb_cd_inloc.f90 b/base/tools/psb_cd_inloc.f90 index 4d0ff7f6d..808a96c6b 100644 --- a/base/tools/psb_cd_inloc.f90 +++ b/base/tools/psb_cd_inloc.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_cd_lstext.f90 b/base/tools/psb_cd_lstext.f90 index f96abd9c5..650960911 100644 --- a/base/tools/psb_cd_lstext.f90 +++ b/base/tools/psb_cd_lstext.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_cd_reinit.f90 b/base/tools/psb_cd_reinit.f90 index 6752c3db7..ef50de31b 100644 --- a/base/tools/psb_cd_reinit.f90 +++ b/base/tools/psb_cd_reinit.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_cd_remap.F90 b/base/tools/psb_cd_remap.F90 index 882af13d7..bfc4dd79d 100644 --- a/base/tools/psb_cd_remap.F90 +++ b/base/tools/psb_cd_remap.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_cd_renum_block.F90 b/base/tools/psb_cd_renum_block.F90 index e78e90797..6a2384924 100644 --- a/base/tools/psb_cd_renum_block.F90 +++ b/base/tools/psb_cd_renum_block.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_cd_set_bld.f90 b/base/tools/psb_cd_set_bld.f90 index ecce17f94..30e9378da 100644 --- a/base/tools/psb_cd_set_bld.f90 +++ b/base/tools/psb_cd_set_bld.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_cd_switch_ovl_indxmap.f90 b/base/tools/psb_cd_switch_ovl_indxmap.f90 index 10ce794ea..1b31ab0d4 100644 --- a/base/tools/psb_cd_switch_ovl_indxmap.f90 +++ b/base/tools/psb_cd_switch_ovl_indxmap.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_cdall.f90 b/base/tools/psb_cdall.f90 index e9ffdaf8e..7deaba6c1 100644 --- a/base/tools/psb_cdall.f90 +++ b/base/tools/psb_cdall.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_cdals.f90 b/base/tools/psb_cdals.f90 index 2b1aa8c5e..0124d01fb 100644 --- a/base/tools/psb_cdals.f90 +++ b/base/tools/psb_cdals.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_cdalv.f90 b/base/tools/psb_cdalv.f90 index 2f740dc87..d1cb951ed 100644 --- a/base/tools/psb_cdalv.f90 +++ b/base/tools/psb_cdalv.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_cdcpy.F90 b/base/tools/psb_cdcpy.F90 index d44c0c95d..4ba714629 100644 --- a/base/tools/psb_cdcpy.F90 +++ b/base/tools/psb_cdcpy.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_cdins.F90 b/base/tools/psb_cdins.F90 index d29aeef86..42583951b 100644 --- a/base/tools/psb_cdins.F90 +++ b/base/tools/psb_cdins.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_cdprt.f90 b/base/tools/psb_cdprt.f90 index 473995df0..5f1793484 100644 --- a/base/tools/psb_cdprt.f90 +++ b/base/tools/psb_cdprt.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_cdren.f90 b/base/tools/psb_cdren.f90 index f80c21baa..d0e67fd62 100644 --- a/base/tools/psb_cdren.f90 +++ b/base/tools/psb_cdren.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_cdrep.f90 b/base/tools/psb_cdrep.f90 index b6f6bfb73..46cf95d8a 100644 --- a/base/tools/psb_cdrep.f90 +++ b/base/tools/psb_cdrep.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_get_overlap.f90 b/base/tools/psb_get_overlap.f90 index 9ef3377e0..6c322772c 100644 --- a/base/tools/psb_get_overlap.f90 +++ b/base/tools/psb_get_overlap.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_glob_to_loc.f90 b/base/tools/psb_glob_to_loc.f90 index 5681d2aeb..0e25648d3 100644 --- a/base/tools/psb_glob_to_loc.f90 +++ b/base/tools/psb_glob_to_loc.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -137,7 +137,7 @@ end subroutine psb_glob_to_loc2v !!$ 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. +!!$ software without specific prior written permission. !!$ !!$ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS !!$ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_icdasb.F90 b/base/tools/psb_icdasb.F90 index 4ad4ce3de..c8af1b17e 100644 --- a/base/tools/psb_icdasb.F90 +++ b/base/tools/psb_icdasb.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/base/tools/psb_loc_to_glob.f90 b/base/tools/psb_loc_to_glob.f90 index e4708b9d7..5be450fce 100644 --- a/base/tools/psb_loc_to_glob.f90 +++ b/base/tools/psb_loc_to_glob.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -122,7 +122,7 @@ end subroutine psb_loc_to_glob2v !!$ 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. +!!$ software without specific prior written permission. !!$ !!$ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS !!$ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/cbind/base/psb_base_cbind_mod.f90 b/cbind/base/psb_base_cbind_mod.f90 index 036e662ab..67d97aad9 100644 --- a/cbind/base/psb_base_cbind_mod.f90 +++ b/cbind/base/psb_base_cbind_mod.f90 @@ -1,6 +1,10 @@ module psb_base_cbind_mod use psb_objhandle_mod use psb_cpenv_mod + use psb_s_serial_cbind_mod + use psb_d_serial_cbind_mod + use psb_c_serial_cbind_mod + use psb_z_serial_cbind_mod use psb_base_tools_cbind_mod use psb_s_tools_cbind_mod use psb_d_tools_cbind_mod diff --git a/cbind/base/psb_c_cbase.h b/cbind/base/psb_c_cbase.h index dcf379656..67651f572 100644 --- a/cbind/base/psb_c_cbase.h +++ b/cbind/base/psb_c_cbase.h @@ -37,7 +37,9 @@ psb_i_t psb_c_cgeasb_options(psb_c_cvector *xh, psb_c_descriptor *cdh, psb_i_ psb_i_t psb_c_cgeasb_options_format(psb_c_cvector *xh, psb_c_descriptor *cdh, const char *fmt, psb_i_t dupl); psb_i_t psb_c_cgefree(psb_c_cvector *xh, psb_c_descriptor *cdh); +psb_i_t psb_c_cgereinit(psb_c_cvector *xh, psb_c_descriptor *cdh, bool clear); psb_c_t psb_c_cgetelem(psb_c_cvector *xh,psb_l_t index,psb_c_descriptor *cd); +psb_c_t psb_c_cmatgetelem(psb_c_cspmat *ah,psb_l_t rowindex,psb_l_t colindex,psb_c_descriptor *cdh); /* sparse matrices*/ psb_c_cspmat* psb_c_new_cspmat(); @@ -62,8 +64,10 @@ psb_i_t psb_c_cspasb_opt(psb_c_cspmat *mh, psb_c_descriptor *cdh, const char *afmt, psb_i_t upd, psb_i_t dupl); psb_i_t psb_c_csprn(psb_c_cspmat *mh, psb_c_descriptor *cdh, _Bool clear); psb_i_t psb_c_cmat_name_print(psb_c_cspmat *mh, char *name); -psb_i_t psb_c_cvect_set_scal(psb_c_cvector *xh, psb_c_t val); -psb_i_t psb_c_cvect_set_vect(psb_c_cvector *xh, psb_c_t *val, psb_i_t n); +psb_i_t psb_c_cvect_set_scal(psb_c_cvector *xh, psb_c_t val); +psb_i_t psb_c_cvect_set_vect(psb_c_cvector *xh, psb_c_t *val, psb_i_t n); +psb_c_t psb_c_cvect_get_entry(psb_c_cvector *xh, psb_i_t index); +psb_i_t psb_c_cvect_set_entry(psb_c_cvector *xh, psb_i_t index, psb_c_t val); /* psblas computational routines */ psb_c_t psb_c_cgedot(psb_c_cvector *xh, psb_c_cvector *yh, psb_c_descriptor *cdh); diff --git a/cbind/base/psb_c_dbase.h b/cbind/base/psb_c_dbase.h index 6a82fe77f..6a6de8be7 100644 --- a/cbind/base/psb_c_dbase.h +++ b/cbind/base/psb_c_dbase.h @@ -37,7 +37,10 @@ psb_i_t psb_c_dgeasb_options(psb_c_dvector *xh, psb_c_descriptor *cdh, psb_i_ psb_i_t psb_c_dgeasb_options_format(psb_c_dvector *xh, psb_c_descriptor *cdh, psb_i_t dupl, const char *fmt); psb_i_t psb_c_dgefree(psb_c_dvector *xh, psb_c_descriptor *cdh); +psb_i_t psb_c_dgereinit(psb_c_dvector *xh, psb_c_descriptor *cdh, bool clear); psb_d_t psb_c_dgetelem(psb_c_dvector *xh,psb_l_t index,psb_c_descriptor *cd); +psb_d_t psb_c_dmatgetelem(psb_c_dspmat *ah,psb_l_t rowindex,psb_l_t colindex,psb_c_descriptor *cdh); + /* sparse matrices*/ psb_c_dspmat* psb_c_new_dspmat(); @@ -62,8 +65,10 @@ psb_i_t psb_c_dspasb_opt(psb_c_dspmat *mh, psb_c_descriptor *cdh, const char *afmt, psb_i_t upd, psb_i_t dupl); psb_i_t psb_c_dsprn(psb_c_dspmat *mh, psb_c_descriptor *cdh, _Bool clear); psb_i_t psb_c_dmat_name_print(psb_c_dspmat *mh, char *name); -psb_i_t psb_c_dvect_set_scal(psb_c_dvector *xh, psb_d_t val); -psb_i_t psb_c_dvect_set_vect(psb_c_dvector *xh, psb_d_t *val, psb_i_t n); +psb_i_t psb_c_dvect_set_scal(psb_c_dvector *xh, psb_d_t val); +psb_i_t psb_c_dvect_set_vect(psb_c_dvector *xh, psb_d_t *val, psb_i_t n); +psb_d_t psb_c_dvect_get_entry(psb_c_dvector *xh, psb_i_t index); +psb_i_t psb_c_dvect_set_entry(psb_c_dvector *xh, psb_i_t index, psb_d_t val); /* psblas computational routines */ psb_d_t psb_c_dgedot(psb_c_dvector *xh, psb_c_dvector *yh, psb_c_descriptor *cdh); diff --git a/cbind/base/psb_c_sbase.h b/cbind/base/psb_c_sbase.h index f132e707e..ae1ff71e2 100644 --- a/cbind/base/psb_c_sbase.h +++ b/cbind/base/psb_c_sbase.h @@ -37,7 +37,10 @@ psb_i_t psb_c_sgeasb_options(psb_c_svector *xh, psb_c_descriptor *cdh, psb_i_ psb_i_t psb_c_sgeasb_options_format(psb_c_svector *xh, psb_c_descriptor *cdh, const char *fmt, psb_i_t dupl); psb_i_t psb_c_sgefree(psb_c_svector *xh, psb_c_descriptor *cdh); +psb_i_t psb_c_sgereinit(psb_c_svector *xh, psb_c_descriptor *cdh, bool clear); psb_s_t psb_c_sgetelem(psb_c_svector *xh,psb_l_t index,psb_c_descriptor *cd); +psb_s_t psb_c_smatgetelem(psb_c_sspmat *ah,psb_l_t rowindex,psb_l_t colindex,psb_c_descriptor *cdh); + /* sparse matrices*/ psb_c_sspmat* psb_c_new_sspmat(); @@ -62,8 +65,11 @@ psb_i_t psb_c_scopy_mat(psb_c_sspmat *ah,psb_c_sspmat *bh,psb_c_descriptor *cd const char *afmt, psb_i_t upd, psb_i_t dupl); psb_i_t psb_c_ssprn(psb_c_sspmat *mh, psb_c_descriptor *cdh, _Bool clear); psb_i_t psb_c_smat_name_print(psb_c_sspmat *mh, char *name); -psb_i_t psb_c_svect_set_scal(psb_c_svector *xh, psb_s_t val); -psb_i_t psb_c_svect_set_vect(psb_c_svector *xh, psb_s_t *val, psb_i_t n); +psb_i_t psb_c_svect_set_scal(psb_c_svector *xh, psb_s_t val); +psb_i_t psb_c_svect_set_vect(psb_c_svector *xh, psb_s_t *val, psb_i_t n); +psb_s_t psb_c_svect_get_entry(psb_c_svector *xh, psb_i_t index); +psb_i_t psb_c_svect_set_entry(psb_c_svector *xh, psb_i_t index, psb_s_t val); + /* psblas computational routines */ psb_s_t psb_c_sgedot(psb_c_svector *xh, psb_c_svector *yh, psb_c_descriptor *cdh); diff --git a/cbind/base/psb_c_zbase.h b/cbind/base/psb_c_zbase.h index 40bff4853..ac7d2b6c4 100644 --- a/cbind/base/psb_c_zbase.h +++ b/cbind/base/psb_c_zbase.h @@ -37,7 +37,10 @@ psb_i_t psb_c_zgeasb_options(psb_c_zvector *xh, psb_c_descriptor *cdh, psb_i_ psb_i_t psb_c_zgeasb_options_format(psb_c_zvector *xh, psb_c_descriptor *cdh, const char *fmt, psb_i_t dupl); psb_i_t psb_c_zgefree(psb_c_zvector *xh, psb_c_descriptor *cdh); +psb_i_t psb_c_zgereinit(psb_c_zvector *xh, psb_c_descriptor *cdh, bool clear); psb_z_t psb_c_zgetelem(psb_c_zvector *xh,psb_l_t index,psb_c_descriptor *cd); +psb_z_t psb_c_zmatgetelem(psb_c_zspmat *ah,psb_l_t rowindex,psb_l_t colindex,psb_c_descriptor *cdh); + /* sparse matrices*/ psb_c_zspmat* psb_c_new_zspmat(); @@ -63,8 +66,10 @@ psb_i_t psb_c_zspasb_opt(psb_c_zspmat *mh, psb_c_descriptor *cdh, const char *afmt, psb_i_t upd, psb_i_t dupl); psb_i_t psb_c_zsprn(psb_c_zspmat *mh, psb_c_descriptor *cdh, _Bool clear); psb_i_t psb_c_zmat_name_print(psb_c_zspmat *mh, char *name); -psb_i_t psb_c_zvect_set_scal(psb_c_zvector *xh, psb_z_t val); -psb_i_t psb_c_zvect_set_vect(psb_c_zvector *xh, psb_z_t *val, psb_i_t n); +psb_i_t psb_c_zvect_set_scal(psb_c_zvector *xh, psb_z_t val); +psb_i_t psb_c_zvect_set_vect(psb_c_zvector *xh, psb_z_t *val, psb_i_t n); +psb_z_t psb_c_zvect_get_entry(psb_c_zvector *xh, psb_i_t index); +psb_i_t psb_c_zvect_set_entry(psb_c_zvector *xh, psb_i_t index, psb_z_t val); /* psblas computational routines */ psb_z_t psb_c_zgedot(psb_c_zvector *xh, psb_c_zvector *yh, psb_c_descriptor *cdh); diff --git a/cbind/linsolve/psb_base_linsolve_cbind_mod.f90 b/cbind/linsolve/psb_base_linsolve_cbind_mod.f90 index a00a68bf0..db9f9d358 100644 --- a/cbind/linsolve/psb_base_linsolve_cbind_mod.f90 +++ b/cbind/linsolve/psb_base_linsolve_cbind_mod.f90 @@ -15,7 +15,6 @@ contains implicit none type(solveroptions) :: options integer(psb_c_ipk_) :: res - options%itmax = 1000 options%itrace = 0 options%istop = 2 @@ -24,6 +23,21 @@ contains res = 0 end function psb_c_DefaultSolverOptions + + function psb_c_PrintSolverOptions(options)& + & bind(c,name='psb_c_PrintSolverOptions') result(res) + implicit none + type(solveroptions) :: options + integer(psb_c_ipk_) :: res + + write(*,*) 'PSBLAS C Interface Solver Options ' + write(*,*) ' Maximum number of iterations :', options%itmax + write(*,*) ' Tracing :', options%itrace + write(*,*) ' Stopping Criterion :', options%istop + write(*,*) ' Restart :', options%irst + write(*,*) ' EPS (tolerance) :', options%eps + res = 0 + end function psb_c_PrintSolverOptions end module psb_base_linsolve_cbind_mod diff --git a/cbind/linsolve/psb_linsolve_cbind.h b/cbind/linsolve/psb_linsolve_cbind.h index 6dd7aa3c8..d1ed4a92b 100644 --- a/cbind/linsolve/psb_linsolve_cbind.h +++ b/cbind/linsolve/psb_linsolve_cbind.h @@ -25,7 +25,8 @@ typedef struct psb_c_solveroptions { } psb_c_SolverOptions; int psb_c_DefaultSolverOptions(psb_c_SolverOptions *opt); - +int psb_c_PrintSolverOptions(psb_c_SolverOptions *opt); + int psb_c_skrylov(const char *method, psb_c_sspmat *ah, psb_c_sprec *ph, psb_c_svector *bh, psb_c_svector *xh, psb_c_descriptor *cdh, psb_c_SolverOptions *opt); diff --git a/cbind/test/pdegen/pdegen3dc.c b/cbind/test/pdegen/pdegen3dc.c index d9f95b238..52a7a97f6 100644 --- a/cbind/test/pdegen/pdegen3dc.c +++ b/cbind/test/pdegen/pdegen3dc.c @@ -12,7 +12,7 @@ /* 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. */ +/* software without specific prior written permission. */ /* */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cmake/readPSBConst.cmake b/cmake/readPSBConst.cmake new file mode 100644 index 000000000..47a28f69b --- /dev/null +++ b/cmake/readPSBConst.cmake @@ -0,0 +1,68 @@ + +macro(_psb_read_const) +file(READ "${CMAKE_CURRENT_SOURCE_DIR}/base/modules/psb_const_mod.F90" _psb_const_mod) +string(REGEX MATCH "psb_version_major_[ \t]+=[ \t]+([0-9]+)" _psb_version_major_match "${_psb_const_mod}") +set(PSBLASMAJOR "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_version_minor_[ \t]+=[ \t]+([0-9]+)" _psb_version_minor_match "${_psb_const_mod}") +set(PSBLASMINOR "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_patchlevel_[ \t]+=[ \t]+([0-9]+)" _psb_patchlevel_match "${_psb_const_mod}") +set(PSBLASPATCH "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_version_string_[ \t]+=[ \t]+([^ \t]+)" _psb_version_string_match "${_psb_const_mod}") +set(PSBLASSTRING "${CMAKE_MATCH_1}") + +string(REGEX MATCH "psb_dupl_null_[ \t]+=[ \t]+([0-9]+)" _psb_dupl_null_match "${_psb_const_mod}") +set(PSBLASDUPNUL "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_dupl_add_[ \t]+=[ \t]+([0-9]+)" _psb_dupl_add_match "${_psb_const_mod}") +set(PSBLASDUPADD "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_dupl_err_[ \t]+=[ \t]+([0-9]+)" _psb_dupl_err_match "${_psb_const_mod}") +set(PSBLASDUPERR "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_dupl_ovwrt_[ \t]+=[ \t]+([0-9]+)" _psb_dupl_ovw_match "${_psb_const_mod}") +set(PSBLASDUPOVW "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_dupl_def_[ \t]+=[ \t]+([^ \t]+)_" _psb_dupl_def_match "${_psb_const_mod}") +set(PSBLASDUPDEF "${CMAKE_MATCH_1}") +string(TOUPPER ${PSBLASDUPDEF} PSBLASDUPDEF) + +string(REGEX MATCH "psb_upd_srch_[ \t]+=[ \t]+([0-9]+)" _psb_upd_srch_match "${_psb_const_mod}") +set(PSBLASUPDSRC "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_upd_perm_[ \t]+=[ \t]+([0-9]+)" _psb_upd_perm_match "${_psb_const_mod}") +set(PSBLASUPDPRM "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_upd_dflt_[ \t]+=[ \t]+([^ \t]+)_" _psb_upd_dflt_match "${_psb_const_mod}") +set(PSBLASUPDDEF "${CMAKE_MATCH_1}") +string(TOUPPER ${PSBLASUPDDEF} PSBLASUPDDEF) + +string(REGEX MATCH "psb_matbld_noremote_[ \t]+=[ \t]+([0-9]+)" _psb_matbld_noremote_match "${_psb_const_mod}") +set(PSBLASBLDNOR "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_matbld_remote_[ \t]+=[ \t]+([0-9]+)" _psb_matbld_remote_match "${_psb_const_mod}") +set(PSBLASBLDRMT "${CMAKE_MATCH_1}") +endmacro(_psb_read_const) + +macro(_psb_read_desc_const) +file(READ "${CMAKE_CURRENT_SOURCE_DIR}/base/modules/desc/psb_desc_const_mod.f90" _psb_const_mod) + +string(REGEX MATCH "psb_swap_send_[ \t]+=[ \t]+([0-9]+)" _psb_swap_send_match "${_psb_const_mod}") +set(PSBSWPSND "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_swap_recv_[ \t]+=[ \t]+([0-9]+)" _psb_swap_recv_match "${_psb_const_mod}") +set(PSBSWPRCV "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_swap_sync_[ \t]+=[ \t]+([0-9]+)" _psb_swap_sync_match "${_psb_const_mod}") +set(PSBSWPSYN "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_swap_mpi_[ \t]+=[ \t]+([0-9]+)" _psb_swap_mpi_match "${_psb_const_mod}") +set(PSBSWPMPI "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_collective_start_[ \t]+=[ \t]+([0-9]+)" _psb_collective_start_match "${_psb_const_mod}") +set(PSBCLCSTR "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_collective_end_[ \t]+=[ \t]+([0-9]+)" _psb_collective_end_match "${_psb_const_mod}") +set(PSBCLCEND "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_collective_sync_[ \t]+=[ \t]+([0-9]+)" _psb_collective_sync_match "${_psb_const_mod}") +set(PSBCLCSYN "${CMAKE_MATCH_1}") + +string(REGEX MATCH "psb_none_[ \t]+=[ \t]+([0-9]+)" _psb_none_match "${_psb_const_mod}") +set(PSBNONE "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_sum_[ \t]+=[ \t]+([0-9]+)" _psb_sum_match "${_psb_const_mod}") +set(PSBSUM "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_avg_[ \t]+=[ \t]+([0-9]+)" _psb_avg_match "${_psb_const_mod}") +set(PSBAVG "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_square_root_[ \t]+=[ \t]+([0-9]+)" _psb_square_root_match "${_psb_const_mod}") +set(PSBSQRT "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_setzero_[ \t]+=[ \t]+([0-9]+)" _psb_setzero_match "${_psb_const_mod}") +set(PSBSETZ "${CMAKE_MATCH_1}") + +endmacro(_psb_read_desc_const) diff --git a/configure b/configure index 390b6555a..e8a214af5 100755 --- a/configure +++ b/configure @@ -732,7 +732,6 @@ INSTALL_LIBDIR INSTALL_DIR INSTALL MPIFCC -AR FLIBS CLINK FLINK @@ -753,6 +752,7 @@ BASEMODNAME CDEFINES FDEFINES LAPACK_LIBS +AR OPENMP_CXXFLAGS OPENMP_CFLAGS OPENMP_FCFLAGS @@ -4282,7 +4282,10 @@ _ACEOF break fi done - rm -f core conftest* + # aligned with autoconf, so not including core; see bug#72225. + rm -f -r a.out a.exe b.out conftest.$ac_ext conftest.$ac_objext \ + conftest.dSYM conftest1.$ac_ext conftest1.$ac_objext conftest1.dSYM \ + conftest2.$ac_ext conftest2.$ac_objext conftest2.dSYM unset am_i ;; esac fi @@ -5932,7 +5935,7 @@ else fi -am__api_version='1.17' +am__api_version='1.18' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5 printf %s "checking whether sleep supports fractional seconds... " >&6; } @@ -6101,10 +6104,14 @@ am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac @@ -6629,9 +6636,133 @@ AMTAR='$${TAR-tar}' # We'll loop over all known methods to create a tar archive until one works. -_am_tools='gnutar pax cpio none' +_am_tools='gnutar plaintar pax cpio none' + +# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +printf %s "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + if test x$am_uid = xunknown; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&5 +printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&2;} + elif test $am_uid -le $am_max_uid; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + _am_tools=none + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +printf %s "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + if test x$gm_gid = xunknown; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&5 +printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&2;} + elif test $am_gid -le $am_max_gid; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + _am_tools=none + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +printf %s "checking how to create a ustar tar archive... " >&6; } + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_ustar-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 + ($_am_tar --version) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 + ($am__untar &5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + if test ${am_cv_prog_tar_ustar+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) am_cv_prog_tar_ustar=$_am_tool ;; +esac +fi -am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 +printf "%s\n" "$am_cv_prog_tar_ustar" >&6; } @@ -8887,18 +9018,215 @@ fi ############################################################################### # Parachute rules for ar and ranlib ... (could cause problems) ############################################################################### +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +set dummy ${ac_tool_prefix}ar; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AR+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi ;; +esac +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +printf "%s\n" "$AR" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_AR+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="ar" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi ;; +esac +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +printf "%s\n" "$ac_ct_AR" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi -if test "X$AR" == "X" ; then - AR="ar" + if test "x$ac_ct_AR" = x; then + AR=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +else + AR="$ac_cv_prog_AR" fi -if test "X$RANLIB" == "X" ; then - RANLIB="ranlib" +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_RANLIB+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi ;; +esac +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +printf "%s\n" "$RANLIB" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -# This should be portable -AR="${AR} -cDr" +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_RANLIB+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi ;; +esac +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +printf "%s\n" "$ac_ct_RANLIB" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +AR="$AR -cr" ############################################################################### # BLAS library presence checks diff --git a/configure.ac b/configure.ac index 5155bcf06..1116417a9 100644 --- a/configure.ac +++ b/configure.ac @@ -745,18 +745,9 @@ fi ############################################################################### # Parachute rules for ar and ranlib ... (could cause problems) ############################################################################### - -if test "X$AR" == "X" ; then - AR="ar" -fi - -if test "X$RANLIB" == "X" ; then - RANLIB="ranlib" -fi - -# This should be portable -AR="${AR} -cDr" - +AC_PROG_AR +AR="${AR} -cr" +AC_PROG_RANLIB ############################################################################### # BLAS library presence checks diff --git a/cuda/License-spgpu b/cuda/License-spgpu new file mode 100644 index 000000000..4e5e16f5b --- /dev/null +++ b/cuda/License-spgpu @@ -0,0 +1,26 @@ + (C) Copyright 2011-2026 Davide Barbieri + (C) Copyright 2011-2026 Salvatore Filippone + + 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. Neither the of the copyright holder nor the names of its contributors + may be used to endorse or promote products derived from this + software without specific prior 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. diff --git a/cuda/License-spgpu.md b/cuda/License-spgpu.md deleted file mode 100644 index 7f4b8ff4c..000000000 --- a/cuda/License-spgpu.md +++ /dev/null @@ -1,21 +0,0 @@ -(c) Copyright 2011-2021 Davide Barbieri, Salvatore Filippone - - 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. - - 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 COPYRIGHT HOLDER OR 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. \ No newline at end of file diff --git a/cuda/Makefile b/cuda/Makefile old mode 100755 new mode 100644 diff --git a/cuda/base_cusparse_mod.F90 b/cuda/base_cusparse_mod.F90 index 94a8255f0..382472c9e 100644 --- a/cuda/base_cusparse_mod.F90 +++ b/cuda/base_cusparse_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/cuda/c_cusparse_mod.F90 b/cuda/c_cusparse_mod.F90 index 3329f7331..3ac7911b9 100644 --- a/cuda/c_cusparse_mod.F90 +++ b/cuda/c_cusparse_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/cuda/ccusparse.c b/cuda/ccusparse.c index 6b5c8ea65..d3d5fd7cb 100644 --- a/cuda/ccusparse.c +++ b/cuda/ccusparse.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/ccusparse.h b/cuda/ccusparse.h index 8643211ad..549fd47ef 100644 --- a/cuda/ccusparse.h +++ b/cuda/ccusparse.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/cintrf.h b/cuda/cintrf.h index c9b70ce38..6555a5198 100644 --- a/cuda/cintrf.h +++ b/cuda/cintrf.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/core_mod.f90 b/cuda/core_mod.f90 index d30f8a996..3eb62f48a 100644 --- a/cuda/core_mod.f90 +++ b/cuda/core_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/cuda/cuda_util.c b/cuda/cuda_util.c index f7414695b..707c88de1 100644 --- a/cuda/cuda_util.c +++ b/cuda/cuda_util.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ @@ -247,14 +247,14 @@ int gpuInit(int dev) void gpuClose() { cudaStream_t st1, st2; - if (! psb_cuda_handle) + if ((! psb_cuda_handle)&&(! psb_cublas_handle)) { st1=spgpuGetStream(psb_cuda_handle); - if (! psb_cublas_handle) cublasGetStream(psb_cublas_handle,&st2); + if (st1 != st2) + psb_cudaDestroyCublasHandle(); + } FcusparseDestroy(); psb_cudaDestroyHandle(); - if (st1 != st2) - psb_cudaDestroyCublasHandle(); free(prop); prop=NULL; hasUVA=-1; diff --git a/cuda/cuda_util.h b/cuda/cuda_util.h index 0c2cce4f7..3163b8ee3 100644 --- a/cuda/cuda_util.h +++ b/cuda/cuda_util.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/cusparse_mod.F90 b/cuda/cusparse_mod.F90 index 4ae16cffc..97f09b1e3 100644 --- a/cuda/cusparse_mod.F90 +++ b/cuda/cusparse_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/cuda/cvectordev.c b/cuda/cvectordev.c index ea09f80e4..5304525c2 100644 --- a/cuda/cvectordev.c +++ b/cuda/cvectordev.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/cvectordev.h b/cuda/cvectordev.h index be095ff58..8f717a3d6 100644 --- a/cuda/cvectordev.h +++ b/cuda/cvectordev.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/d_cusparse_mod.F90 b/cuda/d_cusparse_mod.F90 index 55751475d..598dccb05 100644 --- a/cuda/d_cusparse_mod.F90 +++ b/cuda/d_cusparse_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/cuda/dcusparse.c b/cuda/dcusparse.c index 9af4ce381..80a6d83c7 100644 --- a/cuda/dcusparse.c +++ b/cuda/dcusparse.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/dcusparse.h b/cuda/dcusparse.h index 4b00173b5..149f7b530 100644 --- a/cuda/dcusparse.h +++ b/cuda/dcusparse.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/diagdev.c b/cuda/diagdev.c index 0cf78a41f..7c26e65e1 100644 --- a/cuda/diagdev.c +++ b/cuda/diagdev.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/diagdev.h b/cuda/diagdev.h index 3a062fb78..f5cb51f6b 100644 --- a/cuda/diagdev.h +++ b/cuda/diagdev.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/diagdev_mod.F90 b/cuda/diagdev_mod.F90 index 70d58d4e5..42714902a 100644 --- a/cuda/diagdev_mod.F90 +++ b/cuda/diagdev_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/cuda/dnsdev.c b/cuda/dnsdev.c index 3cf57976f..ce253f5fe 100644 --- a/cuda/dnsdev.c +++ b/cuda/dnsdev.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/dnsdev.h b/cuda/dnsdev.h index aa536105d..f5e006240 100644 --- a/cuda/dnsdev.h +++ b/cuda/dnsdev.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/dnsdev_mod.F90 b/cuda/dnsdev_mod.F90 index fd257e0ef..9dfc3b73b 100644 --- a/cuda/dnsdev_mod.F90 +++ b/cuda/dnsdev_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/cuda/dvectordev.c b/cuda/dvectordev.c index 336aee522..ea1da37af 100644 --- a/cuda/dvectordev.c +++ b/cuda/dvectordev.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/dvectordev.h b/cuda/dvectordev.h index 85699ffd1..263c4b473 100644 --- a/cuda/dvectordev.h +++ b/cuda/dvectordev.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/elldev.c b/cuda/elldev.c index cf49aadd9..f2678f64f 100644 --- a/cuda/elldev.c +++ b/cuda/elldev.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/elldev.h b/cuda/elldev.h index 4e69bb3af..273ffe43c 100644 --- a/cuda/elldev.h +++ b/cuda/elldev.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/elldev_mod.F90 b/cuda/elldev_mod.F90 index 40cf8e495..bbeae25de 100644 --- a/cuda/elldev_mod.F90 +++ b/cuda/elldev_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/cuda/fcusparse.c b/cuda/fcusparse.c index 094348cec..4479efe74 100644 --- a/cuda/fcusparse.c +++ b/cuda/fcusparse.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/fcusparse.h b/cuda/fcusparse.h index 73417591f..bf1b46bec 100644 --- a/cuda/fcusparse.h +++ b/cuda/fcusparse.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/fcusparse_dat.h b/cuda/fcusparse_dat.h index 09de4363c..bbda6b1e3 100644 --- a/cuda/fcusparse_dat.h +++ b/cuda/fcusparse_dat.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/fcusparse_fct.h b/cuda/fcusparse_fct.h index e8ce7934b..d30af56c7 100644 --- a/cuda/fcusparse_fct.h +++ b/cuda/fcusparse_fct.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/hdiagdev.c b/cuda/hdiagdev.c index 813e4fab5..6f0e4ef6c 100644 --- a/cuda/hdiagdev.c +++ b/cuda/hdiagdev.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/hdiagdev.h b/cuda/hdiagdev.h index c02fcc690..9aae0b026 100644 --- a/cuda/hdiagdev.h +++ b/cuda/hdiagdev.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/hdiagdev_mod.F90 b/cuda/hdiagdev_mod.F90 index 9a3530e73..1af4d069b 100644 --- a/cuda/hdiagdev_mod.F90 +++ b/cuda/hdiagdev_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/cuda/hlldev.c b/cuda/hlldev.c index 186831d38..879f165df 100644 --- a/cuda/hlldev.c +++ b/cuda/hlldev.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/hlldev.h b/cuda/hlldev.h index 3b47f5ea1..f80e905dc 100644 --- a/cuda/hlldev.h +++ b/cuda/hlldev.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/hlldev_mod.F90 b/cuda/hlldev_mod.F90 index 90b8e13c8..7a3f13c67 100644 --- a/cuda/hlldev_mod.F90 +++ b/cuda/hlldev_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/cuda/impl/Makefile b/cuda/impl/Makefile old mode 100755 new mode 100644 diff --git a/cuda/ivectordev.c b/cuda/ivectordev.c index db466a6b6..1e139d578 100644 --- a/cuda/ivectordev.c +++ b/cuda/ivectordev.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/ivectordev.h b/cuda/ivectordev.h index 307235433..54811a5a5 100644 --- a/cuda/ivectordev.h +++ b/cuda/ivectordev.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/psb_base_vectordev_mod.F90 b/cuda/psb_base_vectordev_mod.F90 index da02b2f33..955e268fd 100644 --- a/cuda/psb_base_vectordev_mod.F90 +++ b/cuda/psb_base_vectordev_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/cuda/psb_cuda_env_mod.F90 b/cuda/psb_cuda_env_mod.F90 index b397cbd08..2a7a8e46e 100644 --- a/cuda/psb_cuda_env_mod.F90 +++ b/cuda/psb_cuda_env_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/cuda/psb_cuda_mod.F90 b/cuda/psb_cuda_mod.F90 index 12b91b90e..b9f1b8c78 100644 --- a/cuda/psb_cuda_mod.F90 +++ b/cuda/psb_cuda_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/cuda/s_cusparse_mod.F90 b/cuda/s_cusparse_mod.F90 index 24adfdba4..74ca282b8 100644 --- a/cuda/s_cusparse_mod.F90 +++ b/cuda/s_cusparse_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/cuda/scusparse.c b/cuda/scusparse.c index b02299075..78f7c795f 100644 --- a/cuda/scusparse.c +++ b/cuda/scusparse.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/scusparse.h b/cuda/scusparse.h index a5e534467..25945f809 100644 --- a/cuda/scusparse.h +++ b/cuda/scusparse.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/spgpu/coo_conv.h b/cuda/spgpu/coo_conv.h index feccb63a6..adf03efde 100644 --- a/cuda/spgpu/coo_conv.h +++ b/cuda/spgpu/coo_conv.h @@ -6,14 +6,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include diff --git a/cuda/spgpu/core.c b/cuda/spgpu/core.c index e89aa2cfd..154ad244d 100644 --- a/cuda/spgpu/core.c +++ b/cuda/spgpu/core.c @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "core.h" diff --git a/cuda/spgpu/core.h b/cuda/spgpu/core.h index 35d5849d5..9a35deab3 100644 --- a/cuda/spgpu/core.h +++ b/cuda/spgpu/core.h @@ -6,14 +6,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ @@ -36,14 +28,6 @@ * Valeria Cardellini - University of Rome Tor Vergata\n * Salvatore Filippone - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or\n - * modify it under the terms of the GNU General Public License\n - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful,\n - * but WITHOUT ANY WARRANTY; without even the implied warranty of\n - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n - * GNU General Public License for more details. */ #include "psb_config.h" diff --git a/cuda/spgpu/debug.h b/cuda/spgpu/debug.h index d5bc6de2e..433f1a2ca 100644 --- a/cuda/spgpu/debug.h +++ b/cuda/spgpu/debug.h @@ -6,14 +6,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/dia.h b/cuda/spgpu/dia.h index a0b5e2074..e3d342e03 100644 --- a/cuda/spgpu/dia.h +++ b/cuda/spgpu/dia.h @@ -6,14 +6,6 @@ * Copyright (C) 2010 - 2013 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "core.h" diff --git a/cuda/spgpu/dia_conv.h b/cuda/spgpu/dia_conv.h index 3a4de93a4..e0fce4c37 100644 --- a/cuda/spgpu/dia_conv.h +++ b/cuda/spgpu/dia_conv.h @@ -6,14 +6,6 @@ * Copyright (C) 2010 - 2013 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "dia.h" diff --git a/cuda/spgpu/ell.h b/cuda/spgpu/ell.h index 1aa787482..5dae6f040 100644 --- a/cuda/spgpu/ell.h +++ b/cuda/spgpu/ell.h @@ -6,14 +6,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "core.h" diff --git a/cuda/spgpu/ell_conv.h b/cuda/spgpu/ell_conv.h index d6ec37a9c..5ac010de6 100644 --- a/cuda/spgpu/ell_conv.h +++ b/cuda/spgpu/ell_conv.h @@ -6,14 +6,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "ell.h" diff --git a/cuda/spgpu/hdia.h b/cuda/spgpu/hdia.h index e8808fb7c..8cb2f3538 100644 --- a/cuda/spgpu/hdia.h +++ b/cuda/spgpu/hdia.h @@ -6,14 +6,6 @@ * Copyright (C) 2010 - 2013 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "core.h" diff --git a/cuda/spgpu/hdia_conv.h b/cuda/spgpu/hdia_conv.h index c22bf9903..3ddda224d 100644 --- a/cuda/spgpu/hdia_conv.h +++ b/cuda/spgpu/hdia_conv.h @@ -6,14 +6,6 @@ * Copyright (C) 2010 - 2013 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "core.h" diff --git a/cuda/spgpu/hell.h b/cuda/spgpu/hell.h index d177686cd..64af409de 100644 --- a/cuda/spgpu/hell.h +++ b/cuda/spgpu/hell.h @@ -6,14 +6,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "core.h" diff --git a/cuda/spgpu/hell_conv.h b/cuda/spgpu/hell_conv.h index 301fd3032..b7de21da5 100644 --- a/cuda/spgpu/hell_conv.h +++ b/cuda/spgpu/hell_conv.h @@ -6,14 +6,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "hell.h" diff --git a/cuda/spgpu/kernels/abs_base.cuh b/cuda/spgpu/kernels/abs_base.cuh index d48f815d0..6b3cc8d78 100644 --- a/cuda/spgpu/kernels/abs_base.cuh +++ b/cuda/spgpu/kernels/abs_base.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ diff --git a/cuda/spgpu/kernels/amax_base.cuh b/cuda/spgpu/kernels/amax_base.cuh index 4d7e7d4a8..8136b8e45 100644 --- a/cuda/spgpu/kernels/amax_base.cuh +++ b/cuda/spgpu/kernels/amax_base.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ diff --git a/cuda/spgpu/kernels/asum_base.cuh b/cuda/spgpu/kernels/asum_base.cuh index 33f1695c5..8bd609730 100644 --- a/cuda/spgpu/kernels/asum_base.cuh +++ b/cuda/spgpu/kernels/asum_base.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ diff --git a/cuda/spgpu/kernels/axy_base.cuh b/cuda/spgpu/kernels/axy_base.cuh index e1a776fe4..d0752f02e 100644 --- a/cuda/spgpu/kernels/axy_base.cuh +++ b/cuda/spgpu/kernels/axy_base.cuh @@ -5,14 +5,6 @@ * Salvatore Filippone - University of Rome Tor Vergata * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ diff --git a/cuda/spgpu/kernels/cabs.cu b/cuda/spgpu/kernels/cabs.cu index 4c6df219d..ac619cd56 100644 --- a/cuda/spgpu/kernels/cabs.cu +++ b/cuda/spgpu/kernels/cabs.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/camax.cu b/cuda/spgpu/kernels/camax.cu index 05d701e4f..db8653416 100644 --- a/cuda/spgpu/kernels/camax.cu +++ b/cuda/spgpu/kernels/camax.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/casum.cu b/cuda/spgpu/kernels/casum.cu index 7362cff87..ca522d53c 100644 --- a/cuda/spgpu/kernels/casum.cu +++ b/cuda/spgpu/kernels/casum.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/caxpby.cu b/cuda/spgpu/kernels/caxpby.cu index a89f2b9ce..a892dfa2e 100644 --- a/cuda/spgpu/kernels/caxpby.cu +++ b/cuda/spgpu/kernels/caxpby.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" #include "cudalang.h" diff --git a/cuda/spgpu/kernels/caxy.cu b/cuda/spgpu/kernels/caxy.cu index 7b2a06cca..93522407a 100644 --- a/cuda/spgpu/kernels/caxy.cu +++ b/cuda/spgpu/kernels/caxy.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/cdot.cu b/cuda/spgpu/kernels/cdot.cu index 6ad40bae4..ab1a159cc 100644 --- a/cuda/spgpu/kernels/cdot.cu +++ b/cuda/spgpu/kernels/cdot.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/cgath.cu b/cuda/spgpu/kernels/cgath.cu index 256254c3b..5d0fb3a50 100644 --- a/cuda/spgpu/kernels/cgath.cu +++ b/cuda/spgpu/kernels/cgath.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/cnrm2.cu b/cuda/spgpu/kernels/cnrm2.cu index 23e133e88..318c0e693 100644 --- a/cuda/spgpu/kernels/cnrm2.cu +++ b/cuda/spgpu/kernels/cnrm2.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/cscal.cu b/cuda/spgpu/kernels/cscal.cu index 26ffaf3d8..a3ad2c2ca 100644 --- a/cuda/spgpu/kernels/cscal.cu +++ b/cuda/spgpu/kernels/cscal.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/cscat.cu b/cuda/spgpu/kernels/cscat.cu index 683f0ddd8..af3b7d716 100644 --- a/cuda/spgpu/kernels/cscat.cu +++ b/cuda/spgpu/kernels/cscat.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/csetscal.cu b/cuda/spgpu/kernels/csetscal.cu index f87742614..e49a9fffc 100644 --- a/cuda/spgpu/kernels/csetscal.cu +++ b/cuda/spgpu/kernels/csetscal.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/cudadebug.h b/cuda/spgpu/kernels/cudadebug.h index 5367ab3ba..f196c6f94 100644 --- a/cuda/spgpu/kernels/cudadebug.h +++ b/cuda/spgpu/kernels/cudadebug.h @@ -6,14 +6,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cuda_runtime.h" diff --git a/cuda/spgpu/kernels/cudalang.h b/cuda/spgpu/kernels/cudalang.h index ede4f2918..f63124d63 100644 --- a/cuda/spgpu/kernels/cudalang.h +++ b/cuda/spgpu/kernels/cudalang.h @@ -6,14 +6,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ // Used to avoid mad.f32 instructions on c.c. 1.* diff --git a/cuda/spgpu/kernels/cupd_xyz.cu b/cuda/spgpu/kernels/cupd_xyz.cu index e8dc93007..e8cc0eab5 100644 --- a/cuda/spgpu/kernels/cupd_xyz.cu +++ b/cuda/spgpu/kernels/cupd_xyz.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/cxyzw.cu b/cuda/spgpu/kernels/cxyzw.cu index 783c77147..65b9935df 100644 --- a/cuda/spgpu/kernels/cxyzw.cu +++ b/cuda/spgpu/kernels/cxyzw.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/dabs.cu b/cuda/spgpu/kernels/dabs.cu index a27f21e4a..ce19d6d17 100644 --- a/cuda/spgpu/kernels/dabs.cu +++ b/cuda/spgpu/kernels/dabs.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/damax.cu b/cuda/spgpu/kernels/damax.cu index eee0b0650..26b5a8757 100644 --- a/cuda/spgpu/kernels/damax.cu +++ b/cuda/spgpu/kernels/damax.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/dasum.cu b/cuda/spgpu/kernels/dasum.cu index 5d7d7f9b4..7c63c85e2 100644 --- a/cuda/spgpu/kernels/dasum.cu +++ b/cuda/spgpu/kernels/dasum.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/daxpby.cu b/cuda/spgpu/kernels/daxpby.cu index 41e493b1b..110ed46e2 100644 --- a/cuda/spgpu/kernels/daxpby.cu +++ b/cuda/spgpu/kernels/daxpby.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/daxy.cu b/cuda/spgpu/kernels/daxy.cu index 3131a7af0..3a4d132ac 100644 --- a/cuda/spgpu/kernels/daxy.cu +++ b/cuda/spgpu/kernels/daxy.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/ddot.cu b/cuda/spgpu/kernels/ddot.cu index 49f189430..1ac54689b 100644 --- a/cuda/spgpu/kernels/ddot.cu +++ b/cuda/spgpu/kernels/ddot.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/dgath.cu b/cuda/spgpu/kernels/dgath.cu index 26f12647e..eeec50657 100644 --- a/cuda/spgpu/kernels/dgath.cu +++ b/cuda/spgpu/kernels/dgath.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/dia_cspmv.cu b/cuda/spgpu/kernels/dia_cspmv.cu index d4d56dc91..455fe27e8 100644 --- a/cuda/spgpu/kernels/dia_cspmv.cu +++ b/cuda/spgpu/kernels/dia_cspmv.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/dia_dspmv.cu b/cuda/spgpu/kernels/dia_dspmv.cu index 21d16570f..1294088fa 100644 --- a/cuda/spgpu/kernels/dia_dspmv.cu +++ b/cuda/spgpu/kernels/dia_dspmv.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/dia_spmv_base.cuh b/cuda/spgpu/kernels/dia_spmv_base.cuh index afcb38679..a77b4695c 100644 --- a/cuda/spgpu/kernels/dia_spmv_base.cuh +++ b/cuda/spgpu/kernels/dia_spmv_base.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ diff --git a/cuda/spgpu/kernels/dia_spmv_base_template.cuh b/cuda/spgpu/kernels/dia_spmv_base_template.cuh index 792fa7ede..38b90f46c 100644 --- a/cuda/spgpu/kernels/dia_spmv_base_template.cuh +++ b/cuda/spgpu/kernels/dia_spmv_base_template.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ diff --git a/cuda/spgpu/kernels/dia_sspmv.cu b/cuda/spgpu/kernels/dia_sspmv.cu index 17464b432..bc2746c48 100644 --- a/cuda/spgpu/kernels/dia_sspmv.cu +++ b/cuda/spgpu/kernels/dia_sspmv.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/dia_zspmv.cu b/cuda/spgpu/kernels/dia_zspmv.cu index 4f53bf5e8..af9ee56a9 100644 --- a/cuda/spgpu/kernels/dia_zspmv.cu +++ b/cuda/spgpu/kernels/dia_zspmv.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/dnrm2.cu b/cuda/spgpu/kernels/dnrm2.cu index aae3edfce..a4f546c5f 100644 --- a/cuda/spgpu/kernels/dnrm2.cu +++ b/cuda/spgpu/kernels/dnrm2.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/dscal.cu b/cuda/spgpu/kernels/dscal.cu index 9e3b240cb..56c2e4ff9 100644 --- a/cuda/spgpu/kernels/dscal.cu +++ b/cuda/spgpu/kernels/dscal.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/dscat.cu b/cuda/spgpu/kernels/dscat.cu index c6bcf9076..e097a13bb 100644 --- a/cuda/spgpu/kernels/dscat.cu +++ b/cuda/spgpu/kernels/dscat.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/dsetscal.cu b/cuda/spgpu/kernels/dsetscal.cu index 46af07b3b..a45476f75 100644 --- a/cuda/spgpu/kernels/dsetscal.cu +++ b/cuda/spgpu/kernels/dsetscal.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/dupd_xyz.cu b/cuda/spgpu/kernels/dupd_xyz.cu index 11fc6c9af..d37be35dc 100644 --- a/cuda/spgpu/kernels/dupd_xyz.cu +++ b/cuda/spgpu/kernels/dupd_xyz.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/dxyzw.cu b/cuda/spgpu/kernels/dxyzw.cu index f9964cc7d..d78d29786 100644 --- a/cuda/spgpu/kernels/dxyzw.cu +++ b/cuda/spgpu/kernels/dxyzw.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/ell_ccsput.cu b/cuda/spgpu/kernels/ell_ccsput.cu index 66126bd09..f7b28c699 100644 --- a/cuda/spgpu/kernels/ell_ccsput.cu +++ b/cuda/spgpu/kernels/ell_ccsput.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/ell_cspmv.cu b/cuda/spgpu/kernels/ell_cspmv.cu index b2a5ca3a5..9ec798c52 100644 --- a/cuda/spgpu/kernels/ell_cspmv.cu +++ b/cuda/spgpu/kernels/ell_cspmv.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/ell_csput_base.cuh b/cuda/spgpu/kernels/ell_csput_base.cuh index 95e0e33d7..32f6621e9 100644 --- a/cuda/spgpu/kernels/ell_csput_base.cuh +++ b/cuda/spgpu/kernels/ell_csput_base.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ diff --git a/cuda/spgpu/kernels/ell_dcsput.cu b/cuda/spgpu/kernels/ell_dcsput.cu index b1a25d52c..f9f2c904b 100644 --- a/cuda/spgpu/kernels/ell_dcsput.cu +++ b/cuda/spgpu/kernels/ell_dcsput.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/ell_dspmv.cu b/cuda/spgpu/kernels/ell_dspmv.cu index e4e2e8159..1a265878f 100644 --- a/cuda/spgpu/kernels/ell_dspmv.cu +++ b/cuda/spgpu/kernels/ell_dspmv.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/ell_scsput.cu b/cuda/spgpu/kernels/ell_scsput.cu index 0e3ed7b38..383ad1e90 100644 --- a/cuda/spgpu/kernels/ell_scsput.cu +++ b/cuda/spgpu/kernels/ell_scsput.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/ell_spmv_base.cuh b/cuda/spgpu/kernels/ell_spmv_base.cuh index e2af5896f..366f46bb1 100644 --- a/cuda/spgpu/kernels/ell_spmv_base.cuh +++ b/cuda/spgpu/kernels/ell_spmv_base.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ diff --git a/cuda/spgpu/kernels/ell_spmv_base_nors.cuh b/cuda/spgpu/kernels/ell_spmv_base_nors.cuh index 8cd897049..0c70f81cc 100644 --- a/cuda/spgpu/kernels/ell_spmv_base_nors.cuh +++ b/cuda/spgpu/kernels/ell_spmv_base_nors.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ __device__ void diff --git a/cuda/spgpu/kernels/ell_spmv_base_template.cuh b/cuda/spgpu/kernels/ell_spmv_base_template.cuh index fa39d8a6f..2b423c064 100644 --- a/cuda/spgpu/kernels/ell_spmv_base_template.cuh +++ b/cuda/spgpu/kernels/ell_spmv_base_template.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #define THREAD_BLOCK 128 diff --git a/cuda/spgpu/kernels/ell_sspmv.cu b/cuda/spgpu/kernels/ell_sspmv.cu index 298ff1cb7..60175e9b1 100644 --- a/cuda/spgpu/kernels/ell_sspmv.cu +++ b/cuda/spgpu/kernels/ell_sspmv.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/ell_zcsput.cu b/cuda/spgpu/kernels/ell_zcsput.cu index 9fbd43116..fda901b47 100644 --- a/cuda/spgpu/kernels/ell_zcsput.cu +++ b/cuda/spgpu/kernels/ell_zcsput.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/ell_zspmv.cu b/cuda/spgpu/kernels/ell_zspmv.cu index dd1bc72d4..f7f7edf7a 100644 --- a/cuda/spgpu/kernels/ell_zspmv.cu +++ b/cuda/spgpu/kernels/ell_zspmv.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/gath_base.cuh b/cuda/spgpu/kernels/gath_base.cuh index a0e77b44f..4ca94f2ea 100644 --- a/cuda/spgpu/kernels/gath_base.cuh +++ b/cuda/spgpu/kernels/gath_base.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ diff --git a/cuda/spgpu/kernels/hdia_cspmv.cu b/cuda/spgpu/kernels/hdia_cspmv.cu index 27bb30e14..f8853932d 100644 --- a/cuda/spgpu/kernels/hdia_cspmv.cu +++ b/cuda/spgpu/kernels/hdia_cspmv.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/hdia_dspmv.cu b/cuda/spgpu/kernels/hdia_dspmv.cu index c1ac9af1d..940ba79e6 100644 --- a/cuda/spgpu/kernels/hdia_dspmv.cu +++ b/cuda/spgpu/kernels/hdia_dspmv.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/hdia_spmv_base.cuh b/cuda/spgpu/kernels/hdia_spmv_base.cuh index 2c8cfbaff..0391d6c2d 100644 --- a/cuda/spgpu/kernels/hdia_spmv_base.cuh +++ b/cuda/spgpu/kernels/hdia_spmv_base.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ diff --git a/cuda/spgpu/kernels/hdia_spmv_base_template.cuh b/cuda/spgpu/kernels/hdia_spmv_base_template.cuh index 155179fd6..32a575859 100644 --- a/cuda/spgpu/kernels/hdia_spmv_base_template.cuh +++ b/cuda/spgpu/kernels/hdia_spmv_base_template.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #define THREAD_BLOCK 128 diff --git a/cuda/spgpu/kernels/hdia_sspmv.cu b/cuda/spgpu/kernels/hdia_sspmv.cu index ad1d77e7d..a4b8b7ddd 100644 --- a/cuda/spgpu/kernels/hdia_sspmv.cu +++ b/cuda/spgpu/kernels/hdia_sspmv.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/hdia_zspmv.cu b/cuda/spgpu/kernels/hdia_zspmv.cu index f0b592f6e..ffff9fef2 100644 --- a/cuda/spgpu/kernels/hdia_zspmv.cu +++ b/cuda/spgpu/kernels/hdia_zspmv.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/hell_cspmv.cu b/cuda/spgpu/kernels/hell_cspmv.cu index c2b174199..e5800cc36 100644 --- a/cuda/spgpu/kernels/hell_cspmv.cu +++ b/cuda/spgpu/kernels/hell_cspmv.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/hell_dspmv.cu b/cuda/spgpu/kernels/hell_dspmv.cu index fe379841b..e6b14b42b 100644 --- a/cuda/spgpu/kernels/hell_dspmv.cu +++ b/cuda/spgpu/kernels/hell_dspmv.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/hell_spmv_base.cuh b/cuda/spgpu/kernels/hell_spmv_base.cuh index ca074d338..cdd4b367e 100644 --- a/cuda/spgpu/kernels/hell_spmv_base.cuh +++ b/cuda/spgpu/kernels/hell_spmv_base.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ diff --git a/cuda/spgpu/kernels/hell_spmv_base_template.cuh b/cuda/spgpu/kernels/hell_spmv_base_template.cuh index 9ecd8f745..b732f22e7 100644 --- a/cuda/spgpu/kernels/hell_spmv_base_template.cuh +++ b/cuda/spgpu/kernels/hell_spmv_base_template.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #define IDX2 #define THREAD_BLOCK 128 diff --git a/cuda/spgpu/kernels/hell_sspmv.cu b/cuda/spgpu/kernels/hell_sspmv.cu index 86b4c7b3f..f33619386 100644 --- a/cuda/spgpu/kernels/hell_sspmv.cu +++ b/cuda/spgpu/kernels/hell_sspmv.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/hell_zspmv.cu b/cuda/spgpu/kernels/hell_zspmv.cu index aa8f6418d..8d079fa72 100644 --- a/cuda/spgpu/kernels/hell_zspmv.cu +++ b/cuda/spgpu/kernels/hell_zspmv.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/igath.cu b/cuda/spgpu/kernels/igath.cu index a97a1c98d..0494c4f36 100644 --- a/cuda/spgpu/kernels/igath.cu +++ b/cuda/spgpu/kernels/igath.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/iscat.cu b/cuda/spgpu/kernels/iscat.cu index dfb7e3ca2..ad4f33d9c 100644 --- a/cuda/spgpu/kernels/iscat.cu +++ b/cuda/spgpu/kernels/iscat.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/isetscal.cu b/cuda/spgpu/kernels/isetscal.cu index fe028b0ed..1ecc5604a 100644 --- a/cuda/spgpu/kernels/isetscal.cu +++ b/cuda/spgpu/kernels/isetscal.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/sabs.cu b/cuda/spgpu/kernels/sabs.cu index ee0efd8ba..9a82d5099 100644 --- a/cuda/spgpu/kernels/sabs.cu +++ b/cuda/spgpu/kernels/sabs.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/samax.cu b/cuda/spgpu/kernels/samax.cu index 8366e3e1a..51d564077 100644 --- a/cuda/spgpu/kernels/samax.cu +++ b/cuda/spgpu/kernels/samax.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/sasum.cu b/cuda/spgpu/kernels/sasum.cu index 3620775b4..dd02d07c0 100644 --- a/cuda/spgpu/kernels/sasum.cu +++ b/cuda/spgpu/kernels/sasum.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/saxpby.cu b/cuda/spgpu/kernels/saxpby.cu index ab103bbb2..aee2c5504 100644 --- a/cuda/spgpu/kernels/saxpby.cu +++ b/cuda/spgpu/kernels/saxpby.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" #include "cudalang.h" diff --git a/cuda/spgpu/kernels/saxy.cu b/cuda/spgpu/kernels/saxy.cu index 9277a2c8b..a1a641cb6 100644 --- a/cuda/spgpu/kernels/saxy.cu +++ b/cuda/spgpu/kernels/saxy.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/scal_base.cuh b/cuda/spgpu/kernels/scal_base.cuh index c82f97387..2d28327f3 100644 --- a/cuda/spgpu/kernels/scal_base.cuh +++ b/cuda/spgpu/kernels/scal_base.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ diff --git a/cuda/spgpu/kernels/scat_base.cuh b/cuda/spgpu/kernels/scat_base.cuh index f6f619b17..d03146bc1 100644 --- a/cuda/spgpu/kernels/scat_base.cuh +++ b/cuda/spgpu/kernels/scat_base.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ diff --git a/cuda/spgpu/kernels/sdot.cu b/cuda/spgpu/kernels/sdot.cu index 5952c34e1..ef2bf295e 100644 --- a/cuda/spgpu/kernels/sdot.cu +++ b/cuda/spgpu/kernels/sdot.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/setscal_base.cuh b/cuda/spgpu/kernels/setscal_base.cuh index afe821cf1..ba1dc34fc 100644 --- a/cuda/spgpu/kernels/setscal_base.cuh +++ b/cuda/spgpu/kernels/setscal_base.cuh @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ diff --git a/cuda/spgpu/kernels/sgath.cu b/cuda/spgpu/kernels/sgath.cu index 6ccfa7966..8e9cb1b0d 100644 --- a/cuda/spgpu/kernels/sgath.cu +++ b/cuda/spgpu/kernels/sgath.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/snrm2.cu b/cuda/spgpu/kernels/snrm2.cu index 1186cbe92..888e3c841 100644 --- a/cuda/spgpu/kernels/snrm2.cu +++ b/cuda/spgpu/kernels/snrm2.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/sscal.cu b/cuda/spgpu/kernels/sscal.cu index 496d37a0c..4a5e80e52 100644 --- a/cuda/spgpu/kernels/sscal.cu +++ b/cuda/spgpu/kernels/sscal.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/sscat.cu b/cuda/spgpu/kernels/sscat.cu index 44e5dad98..06361b8b7 100644 --- a/cuda/spgpu/kernels/sscat.cu +++ b/cuda/spgpu/kernels/sscat.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/ssetscal.cu b/cuda/spgpu/kernels/ssetscal.cu index dee8e9ab5..dadb2f372 100644 --- a/cuda/spgpu/kernels/ssetscal.cu +++ b/cuda/spgpu/kernels/ssetscal.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/supd_xyz.cu b/cuda/spgpu/kernels/supd_xyz.cu index 0bfed1ae6..cd455302e 100644 --- a/cuda/spgpu/kernels/supd_xyz.cu +++ b/cuda/spgpu/kernels/supd_xyz.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/sxyzw.cu b/cuda/spgpu/kernels/sxyzw.cu index 26422e550..f8b4367e3 100644 --- a/cuda/spgpu/kernels/sxyzw.cu +++ b/cuda/spgpu/kernels/sxyzw.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/zabs.cu b/cuda/spgpu/kernels/zabs.cu index 4bef9294e..e8e95c02b 100644 --- a/cuda/spgpu/kernels/zabs.cu +++ b/cuda/spgpu/kernels/zabs.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/zamax.cu b/cuda/spgpu/kernels/zamax.cu index 4e65cf223..fc5212315 100644 --- a/cuda/spgpu/kernels/zamax.cu +++ b/cuda/spgpu/kernels/zamax.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/zasum.cu b/cuda/spgpu/kernels/zasum.cu index fa40b58ca..84323f1ed 100644 --- a/cuda/spgpu/kernels/zasum.cu +++ b/cuda/spgpu/kernels/zasum.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/zaxpby.cu b/cuda/spgpu/kernels/zaxpby.cu index 07122ff5f..7378b47fb 100644 --- a/cuda/spgpu/kernels/zaxpby.cu +++ b/cuda/spgpu/kernels/zaxpby.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/zaxy.cu b/cuda/spgpu/kernels/zaxy.cu index cdc21adb3..c2a46cb21 100644 --- a/cuda/spgpu/kernels/zaxy.cu +++ b/cuda/spgpu/kernels/zaxy.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/zdot.cu b/cuda/spgpu/kernels/zdot.cu index 1b4b12c9d..bc824e5a7 100644 --- a/cuda/spgpu/kernels/zdot.cu +++ b/cuda/spgpu/kernels/zdot.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/zgath.cu b/cuda/spgpu/kernels/zgath.cu index 59cebf6ed..4a9583c59 100644 --- a/cuda/spgpu/kernels/zgath.cu +++ b/cuda/spgpu/kernels/zgath.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/znrm2.cu b/cuda/spgpu/kernels/znrm2.cu index 3d1ed304b..479900663 100644 --- a/cuda/spgpu/kernels/znrm2.cu +++ b/cuda/spgpu/kernels/znrm2.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/zscal.cu b/cuda/spgpu/kernels/zscal.cu index 13f3ad153..01f17a171 100644 --- a/cuda/spgpu/kernels/zscal.cu +++ b/cuda/spgpu/kernels/zscal.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2014 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/zscat.cu b/cuda/spgpu/kernels/zscat.cu index b43ab761f..0cbb9c0a2 100644 --- a/cuda/spgpu/kernels/zscat.cu +++ b/cuda/spgpu/kernels/zscat.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/zsetscal.cu b/cuda/spgpu/kernels/zsetscal.cu index 70afa01c4..12bf9a5cb 100644 --- a/cuda/spgpu/kernels/zsetscal.cu +++ b/cuda/spgpu/kernels/zsetscal.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2015 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "stdio.h" diff --git a/cuda/spgpu/kernels/zupd_xyz.cu b/cuda/spgpu/kernels/zupd_xyz.cu index 3a7f4c00b..0bfbe8508 100644 --- a/cuda/spgpu/kernels/zupd_xyz.cu +++ b/cuda/spgpu/kernels/zupd_xyz.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/kernels/zxyzw.cu b/cuda/spgpu/kernels/zxyzw.cu index c02991dd9..24c2305df 100644 --- a/cuda/spgpu/kernels/zxyzw.cu +++ b/cuda/spgpu/kernels/zxyzw.cu @@ -4,14 +4,6 @@ * Copyright (C) 2010 - 2012 * Davide Barbieri - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "cudadebug.h" diff --git a/cuda/spgpu/vector.h b/cuda/spgpu/vector.h index 26c3443d6..20980cfef 100644 --- a/cuda/spgpu/vector.h +++ b/cuda/spgpu/vector.h @@ -7,14 +7,6 @@ * Davide Barbieri - University of Rome Tor Vergata * Salvatore Filippone - University of Rome Tor Vergata * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 3 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include "core.h" diff --git a/cuda/svectordev.c b/cuda/svectordev.c index 3bf326654..5b6ec2b43 100644 --- a/cuda/svectordev.c +++ b/cuda/svectordev.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/svectordev.h b/cuda/svectordev.h index 2077c1d3f..1265df4d7 100644 --- a/cuda/svectordev.h +++ b/cuda/svectordev.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/vectordev.c b/cuda/vectordev.c index db976fe9b..3c0bd7651 100644 --- a/cuda/vectordev.c +++ b/cuda/vectordev.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/vectordev.h b/cuda/vectordev.h index 93cf11895..95d5164a6 100644 --- a/cuda/vectordev.h +++ b/cuda/vectordev.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/z_cusparse_mod.F90 b/cuda/z_cusparse_mod.F90 index a4f154553..9ad6825d4 100644 --- a/cuda/z_cusparse_mod.F90 +++ b/cuda/z_cusparse_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/cuda/zcusparse.c b/cuda/zcusparse.c index 93142d221..1a950966b 100644 --- a/cuda/zcusparse.c +++ b/cuda/zcusparse.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/zcusparse.h b/cuda/zcusparse.h index ca0aeeff8..9b0ccf3d5 100644 --- a/cuda/zcusparse.h +++ b/cuda/zcusparse.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/zvectordev.c b/cuda/zvectordev.c index ce0458730..f7b33ac7c 100644 --- a/cuda/zvectordev.c +++ b/cuda/zvectordev.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/cuda/zvectordev.h b/cuda/zvectordev.h index 3f08da83e..136e77010 100644 --- a/cuda/zvectordev.h +++ b/cuda/zvectordev.h @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/ext/Makefile b/ext/Makefile old mode 100755 new mode 100644 diff --git a/ext/impl/Makefile b/ext/impl/Makefile old mode 100755 new mode 100644 diff --git a/ext/psb_ext_mod.F90 b/ext/psb_ext_mod.F90 index b1dbdb59c..a7711968d 100644 --- a/ext/psb_ext_mod.F90 +++ b/ext/psb_ext_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/ext/psi_ext_util_mod.f90 b/ext/psi_ext_util_mod.f90 index afb2c7498..5e85ef105 100644 --- a/ext/psi_ext_util_mod.f90 +++ b/ext/psi_ext_util_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/ext/psi_i_ext_util_mod.f90 b/ext/psi_i_ext_util_mod.f90 index ac073f1d0..9227b07f6 100644 --- a/ext/psi_i_ext_util_mod.f90 +++ b/ext/psi_i_ext_util_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/linsolve/psb_base_linsolve_conv_mod.f90 b/linsolve/psb_base_linsolve_conv_mod.f90 index 5eca2b825..8e45614f4 100644 --- a/linsolve/psb_base_linsolve_conv_mod.f90 +++ b/linsolve/psb_base_linsolve_conv_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/linsolve/psb_linsolve_conv_mod.f90 b/linsolve/psb_linsolve_conv_mod.f90 index 23d6c84c7..e5640eaa9 100644 --- a/linsolve/psb_linsolve_conv_mod.f90 +++ b/linsolve/psb_linsolve_conv_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/linsolve/psb_linsolve_mod.f90 b/linsolve/psb_linsolve_mod.f90 index c54326f3b..1cd324622 100644 --- a/linsolve/psb_linsolve_mod.f90 +++ b/linsolve/psb_linsolve_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/openacc/impl/Makefile b/openacc/impl/Makefile old mode 100755 new mode 100644 diff --git a/prec/psb_prec_const_mod.f90 b/prec/psb_prec_const_mod.f90 index d74c5bf0e..9ad231cea 100644 --- a/prec/psb_prec_const_mod.f90 +++ b/prec/psb_prec_const_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/prec/psb_prec_mod.f90 b/prec/psb_prec_mod.f90 index 86bf50581..00ecb904e 100644 --- a/prec/psb_prec_mod.f90 +++ b/prec/psb_prec_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/prec/psb_prec_type.f90 b/prec/psb_prec_type.f90 index 0c8212462..9d8edfafd 100644 --- a/prec/psb_prec_type.f90 +++ b/prec/psb_prec_type.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/rsb/Makefile b/rsb/Makefile old mode 100755 new mode 100644 diff --git a/rsb/impl/Makefile b/rsb/impl/Makefile old mode 100755 new mode 100644 diff --git a/rsb/impl/psb_d_cp_rsb_from_coo.F90 b/rsb/impl/psb_d_cp_rsb_from_coo.F90 index 145928779..6d2f995ee 100644 --- a/rsb/impl/psb_d_cp_rsb_from_coo.F90 +++ b/rsb/impl/psb_d_cp_rsb_from_coo.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/rsb/impl/psb_d_cp_rsb_to_coo.f90 b/rsb/impl/psb_d_cp_rsb_to_coo.f90 index 3747100ff..d37147ac0 100644 --- a/rsb/impl/psb_d_cp_rsb_to_coo.f90 +++ b/rsb/impl/psb_d_cp_rsb_to_coo.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/rsb/impl/psb_d_mv_rsb_from_coo.f90 b/rsb/impl/psb_d_mv_rsb_from_coo.f90 index 9de74ec77..4f71b4c82 100644 --- a/rsb/impl/psb_d_mv_rsb_from_coo.f90 +++ b/rsb/impl/psb_d_mv_rsb_from_coo.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/rsb/impl/psb_d_rsb_csmv.F90 b/rsb/impl/psb_d_rsb_csmv.F90 index f5dbba97a..817447600 100644 --- a/rsb/impl/psb_d_rsb_csmv.F90 +++ b/rsb/impl/psb_d_rsb_csmv.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/rsb/psb_d_rsb_mat_mod.f90 b/rsb/psb_d_rsb_mat_mod.f90 index e06f8e1d4..64356b443 100644 --- a/rsb/psb_d_rsb_mat_mod.f90 +++ b/rsb/psb_d_rsb_mat_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/rsb/psb_rsb_mod.F90 b/rsb/psb_rsb_mod.F90 index 73db825a2..caec384c2 100644 --- a/rsb/psb_rsb_mod.F90 +++ b/rsb/psb_rsb_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/rsb/psb_rsb_penv_mod.F90 b/rsb/psb_rsb_penv_mod.F90 index 12a56d838..cf57df567 100644 --- a/rsb/psb_rsb_penv_mod.F90 +++ b/rsb/psb_rsb_penv_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/rsb/rsb_int.c b/rsb/rsb_int.c index dc4a80269..2143ee464 100644 --- a/rsb/rsb_int.c +++ b/rsb/rsb_int.c @@ -14,7 +14,7 @@ /* 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. */ + /* software without specific prior written permission. */ /* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ /* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED */ diff --git a/rsb/rsb_mod.F90 b/rsb/rsb_mod.F90 index e52526546..42a567396 100644 --- a/rsb/rsb_mod.F90 +++ b/rsb/rsb_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/computational_routines/geaxpby/autotest.sh b/test/computational_routines/geaxpby/autotest.sh old mode 100755 new mode 100644 diff --git a/test/computational_routines/gedot/autotest.sh b/test/computational_routines/gedot/autotest.sh old mode 100755 new mode 100644 diff --git a/test/computational_routines/test.sh b/test/computational_routines/test.sh old mode 100755 new mode 100644 diff --git a/test/cudakern/Makefile b/test/cudakern/Makefile old mode 100755 new mode 100644 diff --git a/test/cudakern/data_input.f90 b/test/cudakern/data_input.f90 index 274cb7ad5..b63792c39 100644 --- a/test/cudakern/data_input.f90 +++ b/test/cudakern/data_input.f90 @@ -21,7 +21,7 @@ ! documentation and/or other materials provided with the distribution. ! 3. The name of the MLD2P4 group or the names of its contributors may ! not be used to endorse or promote products derived from this -! software without specific written permission. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/cudakern/dpdegenmv.F90 b/test/cudakern/dpdegenmv.F90 index d97a06aae..bd700012d 100644 --- a/test/cudakern/dpdegenmv.F90 +++ b/test/cudakern/dpdegenmv.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/cudakern/spdegenmv.F90 b/test/cudakern/spdegenmv.F90 index 7e8280111..7e7c4384a 100644 --- a/test/cudakern/spdegenmv.F90 +++ b/test/cudakern/spdegenmv.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/fileread/getp.f90 b/test/fileread/getp.f90 index 2a32f7de7..32cb3de11 100644 --- a/test/fileread/getp.f90 +++ b/test/fileread/getp.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/kernel/d_file_spmv.f90 b/test/kernel/d_file_spmv.f90 index 40a799828..e4b4bd4e0 100644 --- a/test/kernel/d_file_spmv.f90 +++ b/test/kernel/d_file_spmv.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/kernel/pdgenspmv.F90 b/test/kernel/pdgenspmv.F90 index 736c1eeee..fa8bd0d40 100644 --- a/test/kernel/pdgenspmv.F90 +++ b/test/kernel/pdgenspmv.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/kernel/s_file_spmv.f90 b/test/kernel/s_file_spmv.f90 index ebbb85cde..4843bd21e 100644 --- a/test/kernel/s_file_spmv.f90 +++ b/test/kernel/s_file_spmv.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/kernel/vecoperation.f90 b/test/kernel/vecoperation.f90 index 3860a3c39..56f959fbb 100644 --- a/test/kernel/vecoperation.f90 +++ b/test/kernel/vecoperation.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/omp/psb_tomp.F90 b/test/omp/psb_tomp.F90 index 45136ad00..c7274f670 100644 --- a/test/omp/psb_tomp.F90 +++ b/test/omp/psb_tomp.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/openacc/dpdegenmv.F90 b/test/openacc/dpdegenmv.F90 index 951e41e19..1bf62b336 100644 --- a/test/openacc/dpdegenmv.F90 +++ b/test/openacc/dpdegenmv.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/openacc/psb_d_oacc_pde3d.F90 b/test/openacc/psb_d_oacc_pde3d.F90 index 841da878e..d4bf35989 100644 --- a/test/openacc/psb_d_oacc_pde3d.F90 +++ b/test/openacc/psb_d_oacc_pde3d.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/serial/psb_d_xyz_impl.f90 b/test/serial/psb_d_xyz_impl.f90 index 8796a3524..a91902358 100644 --- a/test/serial/psb_d_xyz_impl.f90 +++ b/test/serial/psb_d_xyz_impl.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/serial/psb_d_xyz_mat_mod.f90 b/test/serial/psb_d_xyz_mat_mod.f90 index 009ddab07..f2f45dded 100644 --- a/test/serial/psb_d_xyz_mat_mod.f90 +++ b/test/serial/psb_d_xyz_mat_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/util/dhb2mm.f90 b/test/util/dhb2mm.f90 index adc0e2385..18beb126a 100644 --- a/test/util/dhb2mm.f90 +++ b/test/util/dhb2mm.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/util/dmm2hb.f90 b/test/util/dmm2hb.f90 index e567471d8..6c2637cc1 100644 --- a/test/util/dmm2hb.f90 +++ b/test/util/dmm2hb.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/util/zhb2mm.f90 b/test/util/zhb2mm.f90 index 1981c6cce..cf57fc002 100644 --- a/test/util/zhb2mm.f90 +++ b/test/util/zhb2mm.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/test/util/zmm2hb.f90 b/test/util/zmm2hb.f90 index e6993f3e3..e5c44d1de 100644 --- a/test/util/zmm2hb.f90 +++ b/test/util/zmm2hb.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_amd_order.c b/util/psb_amd_order.c index 131303961..f13610831 100644 --- a/util/psb_amd_order.c +++ b/util/psb_amd_order.c @@ -14,7 +14,7 @@ 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. + software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_blockpart_mod.f90 b/util/psb_blockpart_mod.f90 index 08eacb43e..321577433 100644 --- a/util/psb_blockpart_mod.f90 +++ b/util/psb_blockpart_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_c_hbio_impl.f90 b/util/psb_c_hbio_impl.f90 index 06c327c56..d105f0874 100644 --- a/util/psb_c_hbio_impl.f90 +++ b/util/psb_c_hbio_impl.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_c_mmio_impl.f90 b/util/psb_c_mmio_impl.f90 index 222fab82c..68690d06c 100644 --- a/util/psb_c_mmio_impl.f90 +++ b/util/psb_c_mmio_impl.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_d_hbio_impl.f90 b/util/psb_d_hbio_impl.f90 index cca909952..900609977 100644 --- a/util/psb_d_hbio_impl.f90 +++ b/util/psb_d_hbio_impl.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_d_mmio_impl.f90 b/util/psb_d_mmio_impl.f90 index 39dc501a5..374eeed92 100644 --- a/util/psb_d_mmio_impl.f90 +++ b/util/psb_d_mmio_impl.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_gps_mod.f90 b/util/psb_gps_mod.f90 index 7c42d990f..f031096f5 100644 --- a/util/psb_gps_mod.f90 +++ b/util/psb_gps_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_hbio_mod.f90 b/util/psb_hbio_mod.f90 index 01fa4daa3..799c085a2 100644 --- a/util/psb_hbio_mod.f90 +++ b/util/psb_hbio_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_i_mmio_impl.F90 b/util/psb_i_mmio_impl.F90 index c19989970..941559d91 100644 --- a/util/psb_i_mmio_impl.F90 +++ b/util/psb_i_mmio_impl.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_mat_dist_mod.f90 b/util/psb_mat_dist_mod.f90 index e1532a2fc..9f99d51d1 100644 --- a/util/psb_mat_dist_mod.f90 +++ b/util/psb_mat_dist_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_metispart_mod.F90 b/util/psb_metispart_mod.F90 index 413bbdff4..3db8c85ed 100644 --- a/util/psb_metispart_mod.F90 +++ b/util/psb_metispart_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_mmio_mod.F90 b/util/psb_mmio_mod.F90 index 533312bbf..bc0630c28 100644 --- a/util/psb_mmio_mod.F90 +++ b/util/psb_mmio_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_partidx_mod.F90 b/util/psb_partidx_mod.F90 index de025fb0f..98aea50de 100644 --- a/util/psb_partidx_mod.F90 +++ b/util/psb_partidx_mod.F90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_renum_mod.f90 b/util/psb_renum_mod.f90 index 9a060cc6d..cfa4aa8ce 100644 --- a/util/psb_renum_mod.f90 +++ b/util/psb_renum_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_s_hbio_impl.f90 b/util/psb_s_hbio_impl.f90 index 522f8334c..10e9da1c9 100644 --- a/util/psb_s_hbio_impl.f90 +++ b/util/psb_s_hbio_impl.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_s_mmio_impl.f90 b/util/psb_s_mmio_impl.f90 index 1e50adf2f..94e886849 100644 --- a/util/psb_s_mmio_impl.f90 +++ b/util/psb_s_mmio_impl.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_util_mod.f90 b/util/psb_util_mod.f90 index 6743a2d46..86c9b8727 100644 --- a/util/psb_util_mod.f90 +++ b/util/psb_util_mod.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_z_hbio_impl.f90 b/util/psb_z_hbio_impl.f90 index eacf427dc..84c7f6ab0 100644 --- a/util/psb_z_hbio_impl.f90 +++ b/util/psb_z_hbio_impl.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/util/psb_z_mmio_impl.f90 b/util/psb_z_mmio_impl.f90 index 406bdd0c6..948de2833 100644 --- a/util/psb_z_mmio_impl.f90 +++ b/util/psb_z_mmio_impl.f90 @@ -14,7 +14,7 @@ ! 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. +! software without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED