diff --git a/src/ti/linalg/Makefile b/src/ti/linalg/Makefile
index 409128ad036294936e9f662c3089ec9afc75bad9..90b8ef42a9a2ae37694b898570fa9ce8fd17c89a 100644 (file)
--- a/src/ti/linalg/Makefile
+++ b/src/ti/linalg/Makefile
NUM_ARM_CORES=2
NUM_DSP_CORES=2
else
-$(call error, ERROR - MEM_MODEL NOT DEFINED. Must specify one of: MEM_MODEL=Large, MEM_MODEL=Medium, MEM_MODEL=Small)
+$(call error, ERROR - TARGET NOT DEFINED. Must specify one of: TARGET=SOC_K2H, TARGET=SOC_C6678, TARGET=SOC_AM572x)
endif
endif
# - BLIS for specified TARGET, MEM_MODEL, LIBOS (BIOS or OPENCL), NUM_DSP_CORES
# - TICBLAS for specified TARGET, MEM_MODEL, LIBOS (BIOS or OPENCL)
DSPlibs:
- cd $(LINALG_CBLAS_DIR); make arch=C66 alllib; \
+ cd $(LINALG_CBLAS_DIR); make arch=C66 alllib || exit 1; \
cd ../$(LINALG_BLIS_DIR); ./configure -p install/$(BLIS_CFG) c66x; \
- make -j8 MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS) NUM_DSP_CORES=$(NUM_DSP_CORES); make install; \
- cd ../$(LINALG_TICBLAS_DIR)/src; make MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS) NUM_DSP_CORES=$(NUM_DSP_CORES); cd ../lib; \
+ make -j8 MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS) NUM_DSP_CORES=$(NUM_DSP_CORES) || exit 1; make install; \
+ cd ../$(LINALG_TICBLAS_DIR)/src; make MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS) NUM_DSP_CORES=$(NUM_DSP_CORES) || exit 1; cd ../lib; \
echo "combining BLIS, CBLAS, and TICBLAS libraries into one: libcblas.ae66"; \
rm -rf blas_objs blis_objs; mkdir blas_objs blis_objs; cd blis_objs; ar x ../../../blis/install/$(BLIS_CFG)/lib/libblis.ae66; chmod +rw *; \
cd ../blas_objs; ar -x ../../../cblas/lib/C66/libcblas.ae66; ar -x ../libticblas.ae66; chmod +rw *; cd ../../..; \
# Build ARM code for ARM+DSP platforms
ARMlibs:
- cd $(LINALG_CBLAS_DIR); make arch=ARM alllib; \
- cd ../$(LINALG_BLIS_DIR); ./configure -p install/arm cortex-a15; make -j8 NUM_ARM_CORES=$(NUM_ARM_CORES); make install; \
- cd ../$(LINALG_CLAPACK_DIR); make f2clib; make cblaswrap; cd SRC; make -j8; cd ..
+ cd $(LINALG_CBLAS_DIR); make arch=ARM alllib || exit 1; \
+ cd ../$(LINALG_BLIS_DIR); ./configure -p install/arm cortex-a15; make -j8 NUM_ARM_CORES=$(NUM_ARM_CORES) || exit 1; make install; \
+ cd ../$(LINALG_CLAPACK_DIR); make f2clib || exit 1; make cblaswrap || exit 1; cd SRC; make -j8 || exit 1; cd ..
# Build host-callable libraries for ARM+DSP platforms.
# BLAS has a single archive: libcblas_armplusdsp.a, which includes:
# - libcblaswr.a: CBLAS wrapper library used by CLAPACK
# - libf2c.a: F2C library used by CLAPACK
ARMplusDSP: DSPlibs ARMlibs
- cd $(LINALG_BLASACC_DIR)/src; make MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET); cd ../..; \
+ cd $(LINALG_BLASACC_DIR)/src; make MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) || exit 1; cd ../..; \
cd lib; rm -rf *; mkdir blis_objs blas_acc_objs; \
cp ../$(LINALG_BLASACC_DIR)/lib/libcblas_armplusdsp.a blas_acc_objs; \
cp ../$(LINALG_BLIS_DIR)/install/arm/lib/libblis.a blis_objs; \