Cleaning up makefiles.
authorJianzhong Xu <xuj@ti.com>
Mon, 14 Mar 2016 17:42:34 +0000 (17:42 +0000)
committerJianzhong Xu <xuj@ti.com>
Mon, 14 Mar 2016 17:42:34 +0000 (17:42 +0000)
build/Makefile
examples/dsponly/dgemm_test/dgemm_test.c
examples/readme.txt
readme.txt
src/ti/linalg/Makefile

index ecb67824e3206a69c08158adb730e99231096658..a24ab759a464d481ca5c011ae3feb43f149ea83d 100644 (file)
@@ -94,24 +94,20 @@ all: package
        @mkdir -p exports/$(PACKAGE_NAME)/examples
        @mkdir -p exports/$(PACKAGE_NAME)/packages
        @mkdir -p exports/$(PACKAGE_NAME)/packages/ti/linalg
+       @cp -R $(LINALG_BASE_DIR)/src/ti/linalg/* exports/$(PACKAGE_NAME)/packages/ti/linalg
 
 .docs:
        @echo "generating Doxygen document"
        cd $(LINALG_BASE_DIR)/src/ti/linalg; doxygen ./docs/doxygen/doxycfg.txt
 
 #.product: .libs_c6678 .exports .docs .platforms .examples
-package: .lib .docs .platforms .exports .eclipse
+package: .exports .lib .docs .platforms .eclipse
        @echo "copying files ..."
        @cp -R $(LINALG_BASE_DIR)/src/ti/linalg/lib exports/$(PACKAGE_NAME)/packages/ti/linalg
        @cp    $(LINALG_BASE_DIR)/src/ti/linalg/include/* exports/$(PACKAGE_NAME)/packages/ti/linalg
-       cd $(LINALG_BASE_DIR)/src/ti/linalg; make $(CLEAN_TARGET) MEM_MODEL=$(MEM_MODEL); rm -r include; cd -
-       @cp -R $(LINALG_BASE_DIR)/src/ti/linalg/* exports/$(PACKAGE_NAME)/packages/ti/linalg
        @cp -R $(LINALG_BASE_DIR)/src/ti/linalg/docs exports/$(PACKAGE_NAME)
        @ln -s doxygen/html/index.html exports/$(PACKAGE_NAME)/docs/linalg_user_guide.html
        @cp -R $(LINALG_BASE_DIR)/$(EXAMPLES)/* exports/$(PACKAGE_NAME)/examples/
+       @cp -R $(LINALG_BASE_DIR)/examples/readme.txt exports/$(PACKAGE_NAME)/examples/
        @echo "archive files to tar ball ..."
        @cd exports; zip -q -r $(PACKAGE_NAME).zip $(PACKAGE_NAME)
-
-installARMplusDSPlib:
-       cd $(LINALG_BASE_DIR)/src/ti/linalg; \
-       make installARMplusDSPlib DESTDIR=$(DESTDIR)
index a3f16782438cc933c7d1f6ba6fa68c71a9a4f4c3..32ada315d714de80a711244413a43cdc8ad4db6c 100644 (file)
@@ -114,7 +114,9 @@ int main (int argc, char *argv[])
  
   /* Finalize TI CBLAS and reconfigure memory */
   cleanup_after_ticblas();
-
+  
+  printf("DGEMM test finished and passed.\n");
+  
   return 0;
 }
 
index e6edcc154117c7bdec1c9d2cae939d1dba75e5f4..a5e8e422343290414866f4a9a2bae3b449ae263a 100644 (file)
@@ -1,13 +1,15 @@
 Build Instructions of LINALG examples:
 
-1. To build ARM+DSP examples: 
-   1) cd arm+dsp
+1. To build ARM+DSP examples:
+   1) --------- Set environment variables ---------
+      Following environment vaialbes must be set in order to build LINALG:
+      export TARGET_ROOTDIR= <Processor-SDK-Linux installation root>/linux-devkit/sysroots/cortexa15hf-vfp-neon-linux-gnueabi
+      export LINALG_DIR= <LINALG_INSTALLATION_ROOT>
    2) make
 
 2. To build DSP-only examples:   
    1) --------- Set environment variables ---------
       Following environment vaialbes must be set in order to build LINALG (version numbers are used as examples):
-
       export CGTROOT="<TI_CGT_INSTALLATION_ROOT>/cgt-c6x"
       export PDK_DIR="<COMPONENTS_INSTALLATION_ROOT>/pdk_c667x_2_0_1"
       export FC_DIR="<COMPONENTS_INSTALLATION_ROOT>/framework_components_3_40_01_04"
@@ -20,7 +22,6 @@ Build Instructions of LINALG examples:
       export LIBARCH_DIR="<COMPONENTS_INSTALLATION_ROOT>/libarch_1_0_0_0"
       export LINALG_DIR="<COMPONENTS_INSTALLATION_ROOT>/linalg_1_2_0_0"
       export PATH=<TI_CGT_INSTALLATION_ROOT>/cgt-c6x/bin:$PATH
-   2) cd dsponly
-   3) make TARGET=<target_name>
+   2) make TARGET=<target_name>
       where: <target_name> must be one of SOC_K2H, SOC_C6678, or SOC_AM572x
 
index bfd698f45739f25a85d479e02fc7c93c4f8fff93..881ecc0280ddddab1e09e580b4a6fc894e18e7c0 100644 (file)
@@ -16,7 +16,7 @@ export EDMA3_DIR="<COMPONENTS_INSTALLATION_ROOT>/edma3_lld_02_12_01_23"
 export LIBARCH_DIR="<COMPONENTS_INSTALLATION_ROOT>/libarch_1_0_0_0"
 export PATH=<TI_CGT_INSTALLATION_ROOT>/cgt-c6x/bin:$PATH
 
-2.--------- Build LINALG source code ---------
+2.--------- Build LINALG source code and make it a RTSC package ---------
 
 From the root folder of LINALG, the build command is:
 make -f build/Makefile MEM_MODEL=<memory_model_name> TARGET=<target_name> LIBOS=<os_name>
@@ -27,10 +27,10 @@ where:
    3) <os_name> must be one of LIB_OPENCL or LIB_RTOS
 
 Examples:
-1) to build LINALG for K2H in OpenCL environment, type:
+1) to build LINALG large memory model for K2H in OpenCL environment, type:
 make -f build/Makefile MEM_MODEL=Large TARGET=SOC_K2H LIBOS=LIB_OPENCL
 
-2) to build LINALG for C6678 in RTOS environment, type:
+2) to build LINALG small memory model for C6678 in RTOS environment, type:
 make -f build/Makefile MEM_MODEL=Small TARGET=SOC_C6678 LIBOS=LIB_RTOS
 
 3.--------- Build LINALG examples ---------
index 1fc78d19e7433ba62d81623b7394eb9b0dc1da23..33f7b32cf8700e2c8e569b606208e87fde92eff0 100644 (file)
@@ -54,10 +54,10 @@ ARMplusDSP: DSPlibs ARMlibs
        cp $(CLAPACK_HEADERS) include
 
 cleanDSPlibs:
+       rm -f lib/*
        cd $(LINALG_CBLAS_DIR); make arch=C66 clean; \
        cd ../$(LINALG_BLIS_DIR); ./configure -p install/$(BLIS_CFG) c66x; make -j8 clean; \
-       cd ../$(LINALG_TICBLAS_DIR)/src; make clean; \
-       cd ../..; rm lib/*
+       cd ../$(LINALG_TICBLAS_DIR)/src; make clean; 
 
 cleanARMlibs:
        cd $(LINALG_CBLAS_DIR); make arch=ARM clean; \