From 5477314a3ede70aaea99801594a03dc2c5b48f00 Mon Sep 17 00:00:00 2001 From: Yashwant Date: Sun, 22 Mar 2020 08:47:44 +0530 Subject: [PATCH 1/4] Fix Azure Pipeline --- .ci/macos-steps.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.ci/macos-steps.yaml b/.ci/macos-steps.yaml index 968abd018f..fe5920a22f 100644 --- a/.ci/macos-steps.yaml +++ b/.ci/macos-steps.yaml @@ -12,10 +12,19 @@ steps: # Install Build Dependencies - script: | set -e - sudo xcode-select --switch /Applications/Xcode_10.1.app/Contents/Developer + sudo xcode-select --switch /Applications/Xcode_11.3.app/Contents/Developer unset BOOST_ROOT +<<<<<<< 154b0ed963d75b7bf9f02be024191fcd04ff693d pip install cython numpy pandas zipp configparser +======= + pip install cython numpy pandas zipp + brew update +>>>>>>> Fix Azure Pipeline brew install openblas armadillo boost + brew unlink armadillo + brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/9620946e004a29744f9c5e4a27800cba6d6d6b9b/Formula/armadillo.rb + brew unlink hdf5 + brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/7342a4cadf5191d8ae4e83a83e4fbbc3e96d434e/Formula/hdf5.rb if [ "a$(julia.version)" != "a" ]; then brew cask install julia From f18c84d7f3e0c88d5719b61aab570c86670743cf Mon Sep 17 00:00:00 2001 From: Yashwant Singh Parihar Date: Thu, 16 Apr 2020 21:43:15 +0530 Subject: [PATCH 2/4] Remove some extra options. --- src/mlpack/bindings/julia/print_doc_functions_impl.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mlpack/bindings/julia/print_doc_functions_impl.hpp b/src/mlpack/bindings/julia/print_doc_functions_impl.hpp index 8fb2534f72..7058484b57 100644 --- a/src/mlpack/bindings/julia/print_doc_functions_impl.hpp +++ b/src/mlpack/bindings/julia/print_doc_functions_impl.hpp @@ -475,7 +475,8 @@ inline std::string ProgramCall(const std::string& programName) size_t nonreqInputs = 0; for (auto it = parameters.begin(); it != parameters.end(); ++it) { - if (it->second.input && !it->second.required) + if (it->second.input && !it->second.required && (it->second.name == "verbose" || + !it->second.persistent)) { if (inputs == 0 && nonreqInputs == 0) result << " ; "; From 803e2a8f613544e71c7916c49e321b8a64d54558 Mon Sep 17 00:00:00 2001 From: Yashwant Singh Parihar Date: Thu, 16 Apr 2020 21:48:42 +0530 Subject: [PATCH 3/4] Add some ignored options. --- src/mlpack/bindings/python/print_doc_functions_impl.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mlpack/bindings/python/print_doc_functions_impl.hpp b/src/mlpack/bindings/python/print_doc_functions_impl.hpp index 0de6a53126..943e0d9998 100644 --- a/src/mlpack/bindings/python/print_doc_functions_impl.hpp +++ b/src/mlpack/bindings/python/print_doc_functions_impl.hpp @@ -240,7 +240,8 @@ inline std::string ProgramCall(const std::string& programName) bool first = true; for (auto it = parameters.begin(); it != parameters.end(); ++it) { - if (!it->second.input || it->second.persistent) + if (!it->second.input || (it->second.persistent && + it->second.name != "verbose" && it->second.name != "copy_all_inputs")) continue; if (!first) From 54bf1741e9a40a00e2c94d4b39027807ec7f42e7 Mon Sep 17 00:00:00 2001 From: Yashwant Date: Sat, 18 Apr 2020 21:53:37 +0530 Subject: [PATCH 4/4] Resolve some comments. --- .ci/macos-steps.yaml | 11 +---------- HISTORY.md | 2 ++ .../bindings/julia/print_doc_functions_impl.hpp | 4 ++-- .../bindings/python/print_doc_functions_impl.hpp | 2 +- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.ci/macos-steps.yaml b/.ci/macos-steps.yaml index fe5920a22f..968abd018f 100644 --- a/.ci/macos-steps.yaml +++ b/.ci/macos-steps.yaml @@ -12,19 +12,10 @@ steps: # Install Build Dependencies - script: | set -e - sudo xcode-select --switch /Applications/Xcode_11.3.app/Contents/Developer + sudo xcode-select --switch /Applications/Xcode_10.1.app/Contents/Developer unset BOOST_ROOT -<<<<<<< 154b0ed963d75b7bf9f02be024191fcd04ff693d pip install cython numpy pandas zipp configparser -======= - pip install cython numpy pandas zipp - brew update ->>>>>>> Fix Azure Pipeline brew install openblas armadillo boost - brew unlink armadillo - brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/9620946e004a29744f9c5e4a27800cba6d6d6b9b/Formula/armadillo.rb - brew unlink hdf5 - brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/7342a4cadf5191d8ae4e83a83e4fbbc3e96d434e/Formula/hdf5.rb if [ "a$(julia.version)" != "a" ]; then brew cask install julia diff --git a/HISTORY.md b/HISTORY.md index 32670d12bd..e7e0b19770 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,7 @@ ### mlpack ?.?.? ###### ????-??-?? + * Minor Julia and Python documentation fixes (#2373). + * Updated terminal state and fixed bugs for Pendulum environment (#2354, #2369). * Added `EliSH` activation function (#2323). diff --git a/src/mlpack/bindings/julia/print_doc_functions_impl.hpp b/src/mlpack/bindings/julia/print_doc_functions_impl.hpp index 7058484b57..da5d051191 100644 --- a/src/mlpack/bindings/julia/print_doc_functions_impl.hpp +++ b/src/mlpack/bindings/julia/print_doc_functions_impl.hpp @@ -475,8 +475,8 @@ inline std::string ProgramCall(const std::string& programName) size_t nonreqInputs = 0; for (auto it = parameters.begin(); it != parameters.end(); ++it) { - if (it->second.input && !it->second.required && (it->second.name == "verbose" || - !it->second.persistent)) + if (it->second.input && !it->second.required && + (it->second.name == "verbose" || !it->second.persistent)) { if (inputs == 0 && nonreqInputs == 0) result << " ; "; diff --git a/src/mlpack/bindings/python/print_doc_functions_impl.hpp b/src/mlpack/bindings/python/print_doc_functions_impl.hpp index 943e0d9998..767e50ce71 100644 --- a/src/mlpack/bindings/python/print_doc_functions_impl.hpp +++ b/src/mlpack/bindings/python/print_doc_functions_impl.hpp @@ -241,7 +241,7 @@ inline std::string ProgramCall(const std::string& programName) for (auto it = parameters.begin(); it != parameters.end(); ++it) { if (!it->second.input || (it->second.persistent && - it->second.name != "verbose" && it->second.name != "copy_all_inputs")) + it->second.name != "verbose")) continue; if (!first)