clean init- pico not ready yet

cmt/camel_setup.sh

@@ -44,17 +44,17 @@ if [ ! -z "${HILLIPOP_DATA}" ] ; then
     echo "HILLIPOP_DATA not used"
 fi
 
-#echo "Using project $CMTPATH"
-cmt show uses
-
-#too see details during compilation uncomment
-#export VERBOSE=1
 
 if [ -n "${PICO_CODE}" ] && [ -n "${PICO_DATA}" ] ; then
-echo "Using pico(v3.2) with training file: ${PICO_DATA}"
+echo "Using pico=${PICO_CODE} with training file=${PICO_DATA}"
 export PYTHONPATH=${PICO_CODE}:${CAMELROOT}/batch/python:$PYTHONPATH
 else
 echo "not using PICO"
 fi
 
 
+#echo "Using project $CMTPATH"
+cmt show uses
+
+#too see details during compilation uncomment
+#export VERBOSE=1

cmt/requirements-gcc

@@ -48,9 +48,9 @@ macro_append  CAMEL_linkopts " $(CLIKLIBS) "
 
 # PICO 
 macro_append cppflags " -DPICO "
+include_dirs "$(PICO_CODE)/pypico"
 include_dirs "/usr/include/python2.7"
 include_dirs "/usr/lib64/python2.7/site-packages/numpy/core/include"
-include_dirs "$(PICO_CODE)/pypico"
 macro_append CAMEL_linkopts " -L$(PICO_CODE)/build/temp.linux-x86_64-2.7 -lpico -L/usr/lib64/python2.7/config -lpython2.7 "
 macro_append cppflags ' -DPICODATA=\"$(PICO_DATA)\" '
 application testPico -group=test -s=../src/camel/pico/exec testPico.cc