Commit 09128769 authored by Plaszczynski Stephane's avatar Plaszczynski Stephane
Browse files

transisition to pico3.3- under test

parent 7e1bcb90
......@@ -47,7 +47,12 @@ fi
if [ -n "${PICO_CODE}" ] && [ -n "${PICO_DATA}" ] ; then
echo "Using pico=${PICO_CODE} with training file=${PICO_DATA}"
export PYTHONPATH=${PICO_CODE}:${CAMELROOT}/batch/python:$PYTHONPATH
#sets your PYTHONPATH ccording to PICO_CODE
export PYTHONPATH=${PICO_CODE}:$PYTHONPATH
export PICOINC="$(python -c "import pypico; print pypico.get_include()")"
export PICOLIBS="$(python -c "import pypico; print pypico.get_link()")"
echo "includes=$PICOINC"
echo "libs=$PICOLIBS"
else
echo "not using PICO"
fi
......
......@@ -47,11 +47,11 @@ 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"
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 " -DPICO $(PICOINC) "
macro_append CAMEL_linkopts " -L$(PICO_CODE) -lpico -lpython2.7 "
# the privious line should be enough otherwise try the PICOLIBS set in
# camel_setup.sh
#macro_append CAMEL_linkopts " $(PICOLIBS)"
macro_append cppflags ' -DPICODATA=\"$(PICO_DATA)\" '
application testPico -group=test -s=../src/camel/pico/exec testPico.cc
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment