From 8ff06cd740fe1ec49055328ae55cc8916c224ae8 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Mon, 8 Dec 2014 15:26:20 +0000
Subject: [PATCH] correct install process for runtime/ part
---
runtime/quark/CMakeLists.txt | 13 ++++--
runtime/quark/include/CMakeLists.txt | 63 ----------------------------
runtime/starpu/CMakeLists.txt | 20 ++++++---
3 files changed, 23 insertions(+), 73 deletions(-)
delete mode 100644 runtime/quark/include/CMakeLists.txt
diff --git a/runtime/quark/CMakeLists.txt b/runtime/quark/CMakeLists.txt
index 5464c39d3..c11e3aad3 100644
--- a/runtime/quark/CMakeLists.txt
+++ b/runtime/quark/CMakeLists.txt
@@ -53,6 +53,11 @@ set(RUNTIME_HDRS
# ---------------------------
add_custom_target(runtime_quark_include ALL SOURCES ${RUNTIME_HDRS})
+# installation
+# ------------
+#install(FILES ${RUNTIME_HDRS}
+# DESTINATION include)
+
# Generate the morse common for all possible precisions
# -----------------------------------------------------
set(RUNTIME_COMMON_GENERATED "")
@@ -109,12 +114,12 @@ set(ZSRC
codelets/codelet_zgetrf.c
codelets/codelet_zgetrf_incpiv.c
codelets/codelet_zgetrf_nopiv.c
- codelets/codelet_zhessq.c
+ codelets/codelet_zhessq.c
codelets/codelet_zlacpy.c
codelets/codelet_zlange.c
codelets/codelet_zlanhe.c
- codelets/codelet_zlansy.c
- codelets/codelet_zlantr.c
+ codelets/codelet_zlansy.c
+ codelets/codelet_zlantr.c
codelets/codelet_zlaset2.c
codelets/codelet_zlaset.c
codelets/codelet_zlauum.c
@@ -125,7 +130,7 @@ set(ZSRC
codelets/codelet_zpotrf.c
codelets/codelet_zssssm.c
codelets/codelet_zsyssq.c
- codelets/codelet_zsytrf_nopiv.c
+ codelets/codelet_zsytrf_nopiv.c
codelets/codelet_ztrasm.c
codelets/codelet_ztrssq.c
codelets/codelet_ztrtri.c
diff --git a/runtime/quark/include/CMakeLists.txt b/runtime/quark/include/CMakeLists.txt
deleted file mode 100644
index 76837c738..000000000
--- a/runtime/quark/include/CMakeLists.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-###
-#
-# @copyright (c) 2009-2014 The University of Tennessee and The University
-# of Tennessee Research Foundation.
-# All rights reserved.
-# @copyright (c) 2012-2014 Inria. All rights reserved.
-# @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
-#
-###
-#
-# @file CMakeLists.txt
-#
-# @project MORSE
-# MORSE is a software package provided by:
-# Inria Bordeaux - Sud-Ouest,
-# Univ. of Tennessee,
-# King Abdullah Univesity of Science and Technology
-# Univ. of California Berkeley,
-# Univ. of Colorado Denver.
-#
-# @version 0.9.0
-# @author Cedric Castagnede
-# @author Emmanuel Agullo
-# @author Mathieu Faverge
-# @date 13-07-2012
-#
-###
-
-cmake_minimum_required(VERSION 2.8)
-
-# Generate the morse headers for all possible precisions
-# ------------------------------------------------------
-set(QUARKBLAS_HEADERS_GENERATED "")
-set(ZHDR
- quark_zblas.h
- quark_zcblas.h
-)
-
-precisions_rules_py(QUARKBLAS_HEADERS_GENERATED "${ZHDR}"
- PRECISIONS "${CHAMELEON_PRECISION}"
- DICTIONARY "MORSE")
-
-# Define the list of headers
-# --------------------------
-set(QUARKBLAS_HEADERS
- core_blas_dag.h
- morse_quark.h
- quark_blas.h
- ${QUARKBLAS_HEADERS_GENERATED}
- )
-
-# Force generation of headers
-# ---------------------------
-add_custom_target(quarkblas_include ALL SOURCES ${QUARKBLAS_HEADERS})
-
-# installation
-# ------------
-install(FILES ${MORSE_HEADERS}
- DESTINATION include)
-
-###
-### END CMakeLists.txt
-###
diff --git a/runtime/starpu/CMakeLists.txt b/runtime/starpu/CMakeLists.txt
index aba88905e..4a0894613 100644
--- a/runtime/starpu/CMakeLists.txt
+++ b/runtime/starpu/CMakeLists.txt
@@ -53,8 +53,11 @@ precisions_rules_py(RUNTIME_HDRS_GENERATED "${ZHDR}"
# Define the list of headers
# --------------------------
set(RUNTIME_HDRS
- include/morse_starpu.h
+ include/codelet_profile.h
include/codelets.h
+ include/morse_starpu.h
+ include/profiling.h
+ include/workspace.h
${RUNTIME_HDRS_GENERATED}
)
@@ -62,6 +65,11 @@ set(RUNTIME_HDRS
# ---------------------------
add_custom_target(runtime_starpu_include ALL SOURCES ${RUNTIME_HDRS})
+# installation
+# ------------
+#install(FILES ${RUNTIME_HDRS}
+# DESTINATION include)
+
# Generate the morse common for all possible precisions
# -----------------------------------------------------
set(RUNTIME_COMMON_GENERATED "")
@@ -85,7 +93,7 @@ set(RUNTIME_COMMON
codelets/codelet_dataflush.c
${RUNTIME_COMMON_GENERATED}
)
-
+
foreach(_prec ${CHAMELEON_PRECISION})
set_source_files_properties(control/profiling.c PROPERTIES COMPILE_FLAGS "-DPRECISION_${_prec}")
endforeach()
@@ -128,8 +136,8 @@ set(ZSRC
codelets/codelet_zlacpy.c
codelets/codelet_zlange.c
codelets/codelet_zlanhe.c
- codelets/codelet_zlansy.c
- codelets/codelet_zlantr.c
+ codelets/codelet_zlansy.c
+ codelets/codelet_zlantr.c
codelets/codelet_zlaset2.c
codelets/codelet_zlaset.c
codelets/codelet_zlauum.c
@@ -140,7 +148,7 @@ set(ZSRC
codelets/codelet_zpotrf.c
codelets/codelet_zssssm.c
codelets/codelet_zsyssq.c
- codelets/codelet_zsytrf_nopiv.c
+ codelets/codelet_zsytrf_nopiv.c
codelets/codelet_ztrasm.c
codelets/codelet_ztrssq.c
codelets/codelet_ztrtri.c
@@ -156,7 +164,7 @@ set(ZSRC
codelets/codelet_zunmlq.c
codelets/codelet_zunmqr.c
)
-list(REMOVE_DUPLICATES ZSRC)
+list(REMOVE_DUPLICATES ZSRC)
precisions_rules_py(RUNTIME_SRCS_GENERATED "${ZSRC}"
PRECISIONS "${CHAMELEON_PRECISION}"
--
GitLab