diff --git a/Jenkinsfile b/Jenkinsfile index c039742ed..ffded48ec 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ pipeline { parameters { string( name: 'TOOLS_VERSION', - defaultValue: '15.2.1', + defaultValue: '15.3.0', description: 'The XTC tools version' ) string( diff --git a/doc/programming_guide/asr/deploying/linux_macos.rst b/doc/programming_guide/asr/deploying/linux_macos.rst index afda6d63b..ff170a536 100644 --- a/doc/programming_guide/asr/deploying/linux_macos.rst +++ b/doc/programming_guide/asr/deploying/linux_macos.rst @@ -64,7 +64,7 @@ From the build folder run: .. code-block:: console - xrun --xscope-realtime --xscope-port localhost:12345 example_asr.xe + xrun --xscope --xscope-port localhost:12345 example_asr.xe In a second console, run the following command in the ``examples/speech_recognition`` folder to run the host server: diff --git a/doc/programming_guide/asr/deploying/native_windows.rst b/doc/programming_guide/asr/deploying/native_windows.rst index 7aca10498..df20a43d5 100644 --- a/doc/programming_guide/asr/deploying/native_windows.rst +++ b/doc/programming_guide/asr/deploying/native_windows.rst @@ -86,7 +86,7 @@ From the build folder run: .. code-block:: console - xrun --xscope-realtime --xscope-port localhost:12345 example_asr.xe + xrun --xscope --xscope-port localhost:12345 example_asr.xe In a second console, run the following command in the ``examples/speech_recognition`` folder to run the host server: diff --git a/examples/mic_aggregator/mic_aggregator.cmake b/examples/mic_aggregator/mic_aggregator.cmake index 9e17835b6..fdada95f0 100644 --- a/examples/mic_aggregator/mic_aggregator.cmake +++ b/examples/mic_aggregator/mic_aggregator.cmake @@ -3,15 +3,15 @@ #********************** set(APP_SRC_PATH ${CMAKE_CURRENT_LIST_DIR}/src) -set(MIC_ARRAY_DEMO_PATH ${CMAKE_CURRENT_LIST_DIR}/../../modules/io/modules/mic_array/demos/) +set(MIC_ARRAY_DEMO_PATH ${CMAKE_CURRENT_LIST_DIR}/../../modules/io/modules/mic_array/examples/) set(PLATFORM_FILE ${APP_SRC_PATH}/XCORE-AI-EXPLORER.xn) #We make a copy of the par decimator files to avoid include clashes from the demo -set(DEMO_PAR_DECIMATOR_FILES ${MIC_ARRAY_DEMO_PATH}/demo_par_decimator/src/decimator_subtask.c - ${MIC_ARRAY_DEMO_PATH}/demo_par_decimator/src/decimator_subtask.h - ${MIC_ARRAY_DEMO_PATH}/demo_par_decimator/src/app_decimator.hpp - ${MIC_ARRAY_DEMO_PATH}/demo_par_decimator/src/app_mic_array.hpp +set(DEMO_PAR_DECIMATOR_FILES ${MIC_ARRAY_DEMO_PATH}/app_par_decimator/src/decimator_subtask.c + ${MIC_ARRAY_DEMO_PATH}/app_par_decimator/src/decimator_subtask.h + ${MIC_ARRAY_DEMO_PATH}/app_par_decimator/src/app_decimator.hpp + ${MIC_ARRAY_DEMO_PATH}/app_par_decimator/src/app_mic_array.hpp ) file(COPY ${DEMO_PAR_DECIMATOR_FILES} DESTINATION ${APP_SRC_PATH}/par_decimator) diff --git a/examples/speech_recognition/speech_recognition.cmake b/examples/speech_recognition/speech_recognition.cmake index 137ce818c..5d331dca8 100644 --- a/examples/speech_recognition/speech_recognition.cmake +++ b/examples/speech_recognition/speech_recognition.cmake @@ -99,7 +99,7 @@ add_custom_target(flash_app_example_asr # Create run and debug targets #********************** add_custom_target(run_example_asr - COMMAND xrun --xscope-realtime --xscope-port ${XSCOPE_PORT} example_asr.xe + COMMAND xrun --xscope --xscope-port ${XSCOPE_PORT} example_asr.xe DEPENDS example_asr COMMENT "Run application" diff --git a/test/asr/asr.cmake b/test/asr/asr.cmake index e222b1222..77253c27c 100644 --- a/test/asr/asr.cmake +++ b/test/asr/asr.cmake @@ -198,7 +198,7 @@ create_flash_app_target( # Create run target #********************** add_custom_target(run_${TEST_ASR_NAME} - COMMAND xrun --xscope-realtime --xscope-port localhost:12345 ${TEST_ASR_NAME}.xe + COMMAND xrun --xscope --xscope-port localhost:12345 ${TEST_ASR_NAME}.xe DEPENDS ${TEST_ASR_NAME} COMMENT "Run application" diff --git a/test/asr/check_asr.sh b/test/asr/check_asr.sh index f4168d43c..805c3411c 100755 --- a/test/asr/check_asr.sh +++ b/test/asr/check_asr.sh @@ -128,7 +128,7 @@ for ((j = 0; j < ${#INPUT_ARRAY[@]}; j += 1)); do rm ${TEMP_WAV} # call xrun (in background) - (xrun ${ADAPTER_ID} --xscope-realtime --xscope-port localhost:12345 ${PIPELINE_FIRMWARE}) & + (xrun ${ADAPTER_ID} --xscope --xscope-port localhost:12345 ${PIPELINE_FIRMWARE}) & # wait for app to load sleep 15 @@ -157,7 +157,7 @@ for ((j = 0; j < ${#INPUT_ARRAY[@]}; j += 1)); do cp ${PROCESSED_WAV} ${TEMP_XSCOPE_FILEIO_INPUT_WAV} # call xrun (in background) - (xrun ${ADAPTER_ID} --xscope-realtime --xscope-port localhost:12345 ${ASR_FIRMWARE}) & + (xrun ${ADAPTER_ID} --xscope --xscope-port localhost:12345 ${ASR_FIRMWARE}) & # wait for app to load sleep 15 diff --git a/test/pipeline/check_pipeline.sh b/test/pipeline/check_pipeline.sh index c12191270..28c4fafa5 100755 --- a/test/pipeline/check_pipeline.sh +++ b/test/pipeline/check_pipeline.sh @@ -112,7 +112,7 @@ for ((j = 0; j < ${#INPUT_ARRAY[@]}; j += 1)); do sox ${INPUT_WAV} --no-dither -r 16000 -b 32 ${XSCOPE_FILEIO_INPUT_WAV} ${REMIX_PATTERN} # call xrun (in background) - xrun ${ADAPTER_ID} --xscope-realtime --xscope-port localhost:12345 ${FIRMWARE} & + xrun ${ADAPTER_ID} --xscope --xscope-port localhost:12345 ${FIRMWARE} & # wait for app to load sleep 10 diff --git a/test/pipeline/pipeline.cmake b/test/pipeline/pipeline.cmake index 2d6130572..47b85a925 100644 --- a/test/pipeline/pipeline.cmake +++ b/test/pipeline/pipeline.cmake @@ -129,7 +129,7 @@ merge_binaries(${TEST_PIPELINE_NAME} tile0_${TEST_PIPELINE_NAME} tile1_${TEST_PI # Create run and debug targets #********************** add_custom_target(run_${TEST_PIPELINE_NAME} - COMMAND xrun --xscope-realtime --xscope-port localhost:12345 ${TEST_PIPELINE_NAME}.xe + COMMAND xrun --xscope --xscope-port localhost:12345 ${TEST_PIPELINE_NAME}.xe DEPENDS ${TEST_PIPELINE_NAME} COMMENT "Run application"