Mentions légales du service

Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • solverstack/hqr
  • faverge/hqr
  • sylvand/hqr
  • fpruvost/hqr
4 results
Show changes
Commits on Source (6)
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
View file @ 488245fa
......@@ -9,23 +9,33 @@
#
###
cmake_minimum_required (VERSION 3.0)
project (LIBHQR C)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules")
include(GenPkgConfig)
project (HQR C)
# Check if compiled independtly or within another project
if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
set( BUILD_SUBPROJECT OFF )
else()
set( BUILD_SUBPROJECT ON )
endif()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
include(GenHQRPkgConfig)
# The current version number
set (LIBHQR_VERSION_MAJOR 0)
set (LIBHQR_VERSION_MINOR 1)
set (LIBHQR_VERSION_MICRO 0)
set (HQR_VERSION_MAJOR 0)
set (HQR_VERSION_MINOR 1)
set (HQR_VERSION_MICRO 0)
set( LIBHQR_VERSION "${LIBHQR_VERSION_MAJOR}.${LIBHQR_VERSION_MINOR}.${LIBHQR_VERSION_MICRO}" )
set( HQR_VERSION "${HQR_VERSION_MAJOR}.${HQR_VERSION_MINOR}.${HQR_VERSION_MICRO}" )
### Misc options
option(BUILD_SHARED_LIBS
"Build shared libraries" OFF)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build, options are None, Debug, Release, RelWithDebInfo and MinSizeRel." FORCE)
endif(NOT CMAKE_BUILD_TYPE)
if ( NOT BUILD_SUBPROJECT )
option(BUILD_SHARED_LIBS
"Build shared libraries" OFF)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build, options are None, Debug, Release, RelWithDebInfo and MinSizeRel." FORCE)
endif(NOT CMAKE_BUILD_TYPE)
endif()
set(hdrs
include/common.h
......@@ -56,7 +66,7 @@ install(FILES
install(TARGETS hqr DESTINATION lib)
generate_pkgconfig_file()
#generate_hqr_pkgconfig_file()
#-- Add a custom target to generate tags
add_custom_target (tags
......
Makefile deleted 100644 → 0
View file @ 216249e2
CC = gcc
CFLAGS = -Iinclude -Wall -g3
LDFLAGS = -lm
LIBHQR=src/libhqr.a
default: testing_pivgen testing_treedraw testing_tileinit
src/queue.o: include/queue.h include/common.h
src/libhqr.o: include/common.h include/libhqr.h
src/libhqr_dbg.o: include/common.h include/libhqr.h
src/libhqr_systolic.o: include/common.h include/libhqr.h
src/treewalk.o: include/common.h include/libhqr.h include/queue.h
src/treedraw.o: include/common.h include/libhqr.h include/libdraw.h
$(LIBHQR): src/libhqr.o src/libhqr_dbg.o src/libhqr_systolic.o src/treewalk.o src/queue.o src/treedraw.o
ar cr $@ $^
%.o : %.c
$(CC) -c $< -o $@ $(CFLAGS)
testing_pivgen : testings/testing_pivgen.o ${LIBHQR}
$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
testing_treedraw : testings/testing_treedraw.o ${LIBHQR}
$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
testing_tileinit : testings/testing_tileinit.o ${LIBHQR}
$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
clean :
rm -f include/*~
rm -f src/*.o src/*~
rm -f testings/*.o testings/*~
cleanall: clean
rm -f ${LIBHQR}
rm -f testing_pivgen testing_treedraw testing_tileinit tree.svg
cmake_modules/GenPkgConfig.cmake → cmake_modules/GenHQRPkgConfig.cmake
View file @ 488245fa
......@@ -33,18 +33,18 @@
# used in CLEAN_LIB_LIST
#
###
MACRO(CONVERT_LIBSTYLE_TO_PKGCONFIG _liblist)
macro(CONVERT_LIBSTYLE_TO_PKGCONFIG _liblist)
set(${_liblist}_CPY "${${_liblist}}")
set(${_liblist} "")
foreach(_dep ${${_liblist}_CPY})
if (${_dep} MATCHES "^/")
get_filename_component(dep_libname ${_dep} NAME)
get_filename_component(dep_libdir ${_dep} DIRECTORY)
STRING(REPLACE "lib" "" dep_libname "${dep_libname}")
STRING(REPLACE ".so" "" dep_libname "${dep_libname}")
STRING(REPLACE ".a" "" dep_libname "${dep_libname}")
STRING(REPLACE ".dylib" "" dep_libname "${dep_libname}")
STRING(REPLACE ".dll" "" dep_libname "${dep_libname}")
string(REPLACE "lib" "" dep_libname "${dep_libname}")
string(REPLACE ".so" "" dep_libname "${dep_libname}")
string(REPLACE ".a" "" dep_libname "${dep_libname}")
string(REPLACE ".dylib" "" dep_libname "${dep_libname}")
string(REPLACE ".dll" "" dep_libname "${dep_libname}")
list(APPEND ${_liblist} -L${dep_libdir} -l${dep_libname})
elseif(NOT ${_dep} MATCHES "^-")
list(APPEND ${_liblist} "-l${_dep}")
......@@ -52,7 +52,7 @@ MACRO(CONVERT_LIBSTYLE_TO_PKGCONFIG _liblist)
list(APPEND ${_liblist} ${_dep})
endif()
endforeach()
ENDMACRO(CONVERT_LIBSTYLE_TO_PKGCONFIG)
endmacro(CONVERT_LIBSTYLE_TO_PKGCONFIG)
###
#
......@@ -60,44 +60,44 @@ ENDMACRO(CONVERT_LIBSTYLE_TO_PKGCONFIG)
# used in GENERATE_PKGCONFIG_FILE
#
###
MACRO(CLEAN_LIB_LIST _package)
macro(CLEAN_LIB_LIST _package)
list(REMOVE_DUPLICATES ${_package}_PKGCONFIG_LIBS)
list(REMOVE_DUPLICATES ${_package}_PKGCONFIG_LIBS_PRIVATE)
list(REMOVE_DUPLICATES ${_package}_PKGCONFIG_REQUIRED)
list(REMOVE_DUPLICATES ${_package}_PKGCONFIG_REQUIRED_PRIVATE)
CONVERT_LIBSTYLE_TO_PKGCONFIG(${_package}_PKGCONFIG_LIBS)
CONVERT_LIBSTYLE_TO_PKGCONFIG(${_package}_PKGCONFIG_LIBS_PRIVATE)
STRING(REPLACE ";" " " ${_package}_PKGCONFIG_LIBS "${${_package}_PKGCONFIG_LIBS}")
STRING(REPLACE ";" " " ${_package}_PKGCONFIG_LIBS_PRIVATE "${${_package}_PKGCONFIG_LIBS_PRIVATE}")
STRING(REPLACE ";" " " ${_package}_PKGCONFIG_REQUIRED "${${_package}_PKGCONFIG_REQUIRED}")
STRING(REPLACE ";" " " ${_package}_PKGCONFIG_REQUIRED_PRIVATE "${${_package}_PKGCONFIG_REQUIRED_PRIVATE}")
ENDMACRO(CLEAN_LIB_LIST)
convert_libstyle_to_pkgconfig(${_package}_PKGCONFIG_LIBS)
convert_libstyle_to_pkgconfig(${_package}_PKGCONFIG_LIBS_PRIVATE)
string(REPLACE ";" " " ${_package}_PKGCONFIG_LIBS "${${_package}_PKGCONFIG_LIBS}")
string(REPLACE ";" " " ${_package}_PKGCONFIG_LIBS_PRIVATE "${${_package}_PKGCONFIG_LIBS_PRIVATE}")
string(REPLACE ";" " " ${_package}_PKGCONFIG_REQUIRED "${${_package}_PKGCONFIG_REQUIRED}")
string(REPLACE ";" " " ${_package}_PKGCONFIG_REQUIRED_PRIVATE "${${_package}_PKGCONFIG_REQUIRED_PRIVATE}")
endmacro(CLEAN_LIB_LIST)
###
#
# GENERATE_PKGCONFIG_FILE: generate files libhqr.pc
#
###
MACRO(GENERATE_PKGCONFIG_FILE)
macro(GENERATE_HQR_PKGCONFIG_FILE)
SET(LIBHQR_PKGCONFIG_LIBS "-lhqr")
SET(LIBHQR_PKGCONFIG_LIBS_PRIVATE "-lm")
SET(LIBHQR_PKGCONFIG_REQUIRED "")
SET(LIBHQR_PKGCONFIG_REQUIRED_PRIVATE "")
set(HQR_PKGCONFIG_LIBS "-lhqr")
set(HQR_PKGCONFIG_LIBS_PRIVATE "-lm")
set(HQR_PKGCONFIG_REQUIRED "")
set(HQR_PKGCONFIG_REQUIRED_PRIVATE "")
CLEAN_LIB_LIST(LIBHQR)
clean_lib_list(LIBHQR)
SET(_output_libhqr_file "${CMAKE_BINARY_DIR}/libhqr.pc")
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/lib/pkgconfig/libhqr.pc.in"
"${_output_libhqr_file}"
set(_output_libhqr_file "${CMAKE_BINARY_DIR}/hqr.pc")
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/lib/pkgconfig/hqr.pc.in"
"${_output_hqr_file}"
@ONLY
)
INSTALL(
FILES ${_output_libhqr_file}
install(
FILES ${_output_hqr_file}
DESTINATION lib/pkgconfig
)
ENDMACRO(GENERATE_PKGCONFIG_FILE)
endmacro(GENERATE_HQR_PKGCONFIG_FILE)
##
## @end file GenPkgConfig.cmake
......
src/treewalk.c
View file @ 488245fa
......@@ -162,7 +162,7 @@ void libhqr_treewalk(const libhqr_tree_t *qrtree, int k, int *tiles)
***************************************************/
void libhqr_print_tree(const libhqr_tree_t *qrtree, libhqr_tiledesc_t *matrix){
int maxMN, minMN, k, i, step_m;
int maxMN, minMN, k, i;
int *tiles;
int *step;
FILE *file;
......
testings/testing_tileinit.c
View file @ 488245fa
......@@ -22,7 +22,6 @@
int
main(int argc, char ** argv)
{
int rc;
libhqr_tree_t qrtree;
libhqr_tiledesc_t matrix;
......@@ -32,7 +31,7 @@ main(int argc, char ** argv)
matrix.mt = 1;
matrix.nt = 1;
libhqr_hqr_init( &qrtree, LIBHQR_QR, &matrix, 0, 0, 1, 3, 0, 0);
rc = libhqr_tree_check( &matrix, &qrtree );
if(libhqr_tree_check( &matrix, &qrtree )) return 0;
libhqr_matrix_finalize( &qrtree );
return 1;
}