Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add onehot #61

Merged
merged 5 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
minor fix
  • Loading branch information
takenori-y committed May 23, 2024
commit 3dc6937201edff362143a38587b8bb34157e7c46
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ all: release

release:
mkdir -p $(BUILDDIR)
cd $(BUILDDIR); cmake .. -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_BUILD_TYPE=Release
cd $(BUILDDIR); make -j $(JOBS) install
cd $(BUILDDIR) && cmake .. -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_BUILD_TYPE=Release
cd $(BUILDDIR) && make -j $(JOBS) install

debug:
mkdir -p $(BUILDDIR)
cd $(BUILDDIR); cmake .. -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_BUILD_TYPE=Debug
cd $(BUILDDIR); make -j $(JOBS) install
cd $(BUILDDIR) && cmake .. -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_BUILD_TYPE=Debug
cd $(BUILDDIR) && make -j $(JOBS) install

doc:
@if [ ! -f ./tools/venv/bin/activate ]; then \
Expand All @@ -52,13 +52,13 @@ doc:
echo ""; \
exit 1; \
fi
cd $(DOCDIR); ../tools/doxygen/build/bin/doxygen
. ./tools/venv/bin/activate; cd $(DOCDIR); make html
cd $(DOCDIR) && ../tools/doxygen/build/bin/doxygen
. ./tools/venv/bin/activate && cd $(DOCDIR) && make html

doc-clean:
rm -rf $(DOCDIR)/xml
@if [ -f ./tools/venv/bin/activate ]; then \
. ./tools/venv/bin/activate; cd $(DOCDIR); make clean; \
. ./tools/venv/bin/activate && cd $(DOCDIR) && make clean; \
fi

format: format-sh format-py format-cc
Expand Down
2 changes: 1 addition & 1 deletion src/main/nrand.cc
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ int main(int argc, char* argv[]) {
case 'u': {
if (!sptk::ConvertStringToDouble(optarg, &mean)) {
std::ostringstream error_message;
error_message << "The argument for the -u option must be double";
error_message << "The argument for the -u option must be numeric";
sptk::PrintErrorMessage("nrand", error_message);
return 1;
}
Expand Down
16 changes: 8 additions & 8 deletions tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ venv:
else \
test -d venv || python$(PYTHON_VERSION) -m venv venv; \
fi
. venv/bin/activate; python -m pip install pip --upgrade; \
python -m pip install -r requirements.txt --upgrade
. ./venv/bin/activate && python -m pip install pip --upgrade
. ./venv/bin/activate && python -m pip install -r requirements.txt --upgrade
touch venv/bin/activate

venv_dev:
Expand All @@ -40,8 +40,8 @@ venv_dev:
else \
test -d venv || python$(PYTHON_VERSION) -m venv venv; \
fi
. venv/bin/activate; python -m pip install pip --upgrade; \
python -m pip install -r requirements.txt -r test_requirements.txt --upgrade
. ./venv/bin/activate && python -m pip install pip --upgrade
. ./venv/bin/activate && python -m pip install -r requirements.txt -r test_requirements.txt --upgrade
touch venv/bin/activate

bats.done:
Expand All @@ -52,7 +52,7 @@ bats.done:
doxygen.done:
rm -rf doxygen
git clone https://github.com/doxygen/doxygen.git -b Release_1_9_1 --single-branch --depth 1
cd doxygen; mkdir -p build; cd build; cmake -G "Unix Makefiles" ..; make -j $(JOBS)
cd doxygen && mkdir -p build && cd build && cmake -G "Unix Makefiles" .. && make -j $(JOBS)
touch doxygen.done

shellcheck.done:
Expand All @@ -72,9 +72,9 @@ shfmt.done:

sptk.done:
rm -rf sptk
export GIT_SSL_NO_VERIFY=1; git clone https://git.code.sf.net/p/sp-tk/SPTK sptk
cd sptk/src; aclocal; automake -a -c; autoconf; \
./configure --enable-double --prefix=$(CURDIR)/sptk; make -j $(JOBS); make install
export GIT_SSL_NO_VERIFY=1 && git clone https://git.code.sf.net/p/sp-tk/SPTK sptk
cd sptk/src && aclocal && automake -a -c && autoconf
cd sptk/src && ./configure --enable-double --prefix=$(CURDIR)/sptk && make -j $(JOBS) && make install
touch sptk.done

clean:
Expand Down