Mercurial > hg > piper-vamp-js-builds
changeset 33:935214f16f91
Add pYin build, use Makefile test target
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Fri, 11 Nov 2016 11:13:42 +0000 |
| parents | 2cd8c30131ac |
| children | b51164a0c0f9 |
| files | build-all.sh pyin/Makefile pyin/pyin.cpp |
| diffstat | 3 files changed, 49 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/build-all.sh Fri Nov 11 11:13:29 2016 +0000 +++ b/build-all.sh Fri Nov 11 11:13:42 2016 +0000 @@ -22,13 +22,7 @@ for x in *; do if [ -d "$x" ] && [ -f "$x/Makefile" ]; then echo - js=$(echo "$x"/*.js) - if [ ! -f "$js" ]; then - echo "Problem running test for $x: more than one js file? (js=$js)" - else - node ../piper-vamp-js/test/node-load-test.js "$(pwd)/$js" && \ - echo "Successfully ran basic load-test on $js" - fi + make -C "$x" test fi done
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pyin/Makefile Fri Nov 11 11:13:42 2016 +0000 @@ -0,0 +1,28 @@ + +PIPER_VAMP_JS_DIR := ../../piper-vamp-js +PLUGIN_SRC_DIR := ../../pyin + +MODULE_NAME := PYin + +SOURCE_FILES := \ + PYinVamp.cpp \ + YinVamp.cpp \ + LocalCandidatePYIN.cpp \ + Yin.cpp \ + YinUtil.cpp \ + MonoNote.cpp \ + MonoPitch.cpp \ + MonoNoteParameters.cpp \ + SparseHMM.cpp \ + MonoNoteHMM.cpp \ + MonoPitchHMM.cpp + +PLUGIN_SOURCES := $(addprefix $(PLUGIN_SRC_DIR)/,$(SOURCE_FILES)) + +INCLUDES := -I$(PLUGIN_SRC_DIR) -I../../vamp-build-and-test/DEPENDENCIES/generic/include + +MODULE_SOURCE := pyin.cpp + +EMFLAGS := -s TOTAL_MEMORY=100000000 + +include $(PIPER_VAMP_JS_DIR)/Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pyin/pyin.cpp Fri Nov 11 11:13:42 2016 +0000 @@ -0,0 +1,20 @@ +/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ + +#include "PiperExport.h" + +#include "PYinVamp.h" +#include "YinVamp.h" +#include "LocalCandidatePYIN.h" + +std::string soname("pyin"); + +piper_vamp_js::PiperAdapter<PYinVamp> pyinAdapter(soname); +piper_vamp_js::PiperAdapter<YinVamp> yinAdapter(soname); +piper_vamp_js::PiperAdapter<LocalCandidatePYIN> localCandAdapter(soname); + +piper_vamp_js::PiperPluginLibrary library({ + &pyinAdapter, &yinAdapter, &localCandAdapter +}); + +PIPER_EXPORT_LIBRARY(library); +