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.

Sign up for GitHub

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

Jump to bottom

Add Adam for DnnTrainer #267

Merged
merged 4 commits into from
Jan 30, 2022
Merged

Add Adam for DnnTrainer #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
380d2f5
fix: add native
takuya-takeuchi Jan 30, 2022
7b4d4fd
fix: support RelWithDebInfo
takuya-takeuchi Jan 30, 2022
d365c99
fix: arg order
takuya-takeuchi Jan 30, 2022
deafa45
fix: add managed
takuya-takeuchi Jan 30, 2022
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
5 changes: 3 additions & 2 deletions nuget/BuildUtils.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ class Config
$ConfigurationArray =
@(
"Debug",
"Release"
"Release",
"RelWithDebInfo"
)

$TargetArray =
Expand Down Expand Up @@ -167,7 +168,7 @@ class Config
#***************************************
# Arguments
# %1: Root directory of DlibDotNet
# %2: Build Configuration (Release/Debug)
# %2: Build Configuration (Release/Debug/RelWithDebug)
# %3: Target (cpu/cuda/mkl/arm)
# %4: Architecture (32/64)
# %5: Platform (desktop/android/ios/uwp)
Expand Down
27 changes: 17 additions & 10 deletions src/DlibDotNet.Native.Dnn/dlib/dnn/loss/LossBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,37 +55,44 @@ class LossBase

public:
virtual void* trainer_new(void* net) = 0;
virtual void* trainer_new_sgd(void* net, sgd* sgd) = 0;
virtual void trainer_delete(void* trainer) = 0;
virtual void trainer_set_learning_rate(void* trainer, const double lr) = 0;
virtual void trainer_get_learning_rate(void* trainer, double* lr) = 0;
virtual void trainer_get_average_loss(void* trainer, double* loss) = 0;
virtual void trainer_get_average_test_loss(void* trainer, double* loss) = 0;
virtual void trainer_set_min_learning_rate(void* trainer, const double lr) = 0;
virtual void trainer_set_mini_batch_size(void* trainer, const unsigned long size) = 0;
virtual void trainer_be_verbose(void* trainer) = 0;
virtual void* trainer_new_optimizer(void* net, const int32_t optimizer_id, void* optimizer) = 0;
virtual void trainer_delete(void* trainer, const int32_t optimizer_id) = 0;
virtual void trainer_set_learning_rate(void* trainer, const int32_t optimizer_id, const double lr) = 0;
virtual void trainer_get_learning_rate(void* trainer, const int32_t optimizer_id, double* lr) = 0;
virtual void trainer_get_average_loss(void* trainer, const int32_t optimizer_id, double* loss) = 0;
virtual void trainer_get_average_test_loss(void* trainer, const int32_t optimizer_id, double* loss) = 0;
virtual void trainer_set_min_learning_rate(void* trainer, const int32_t optimizer_id, const double lr) = 0;
virtual void trainer_set_mini_batch_size(void* trainer, const int32_t optimizer_id, const unsigned long size) = 0;
virtual void trainer_be_verbose(void* trainer, const int32_t optimizer_id) = 0;
virtual void trainer_set_synchronization_file(void* trainer,
const int32_t optimizer_id,
const char* filename,
const int filename_length,
const unsigned long second) = 0;
virtual void trainer_set_iterations_without_progress_threshold(void* trainer,
const int32_t optimizer_id,
const unsigned long thresh) = 0;
virtual void trainer_set_test_iterations_without_progress_threshold(void* trainer,
const int32_t optimizer_id,
const unsigned long thresh) = 0;
virtual void trainer_get_net(void* trainer,
const int32_t optimizer_id,
void** ret) = 0;
virtual void trainer_operator_left_shift(void* trainer, std::ostringstream* stream) = 0;
virtual void trainer_operator_left_shift(void* trainer, const int32_t optimizer_id, std::ostringstream* stream) = 0;
virtual void trainer_test_one_step(void* trainer,
const int32_t optimizer_id,
matrix_element_type data_element_type,
void* data,
matrix_element_type label_element_type,
void* labels) = 0;
virtual void trainer_train(void* trainer,
const int32_t optimizer_id,
matrix_element_type data_element_type,
void* data,
matrix_element_type label_element_type,
void* labels) = 0;
virtual void trainer_train_one_step(void* trainer,
const int32_t optimizer_id,
matrix_element_type data_element_type,
void* data,
matrix_element_type label_element_type,
Expand Down
31 changes: 19 additions & 12 deletions src/DlibDotNet.Native.Dnn/dlib/dnn/loss/metric/LossMetric.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,37 +79,44 @@ class LossMetric : public LossMetricBase

public:
virtual void* trainer_new(void* net) override;
virtual void* trainer_new_sgd(void* net, sgd* sgd) override;
virtual void trainer_delete(void* trainer) override;
virtual void trainer_set_learning_rate(void* trainer, const double lr) override;
virtual void trainer_get_learning_rate(void* trainer, double* lr) override;
virtual void trainer_get_average_loss(void* trainer, double* loss) override;
virtual void trainer_get_average_test_loss(void* trainer, double* loss) override;
virtual void trainer_set_min_learning_rate(void* trainer, const double lr) override;
virtual void trainer_set_mini_batch_size(void* trainer, const unsigned long size) override;
virtual void trainer_be_verbose(void* trainer) override;
virtual void* trainer_new_optimizer(void* net, const int32_t optimizer_id, void* optimizer) override;
virtual void trainer_delete(void* trainer, const int32_t optimizer_id) override;
virtual void trainer_set_learning_rate(void* trainer, const int32_t optimizer_id, const double lr) override;
virtual void trainer_get_learning_rate(void* trainer, const int32_t optimizer_id, double* lr) override;
virtual void trainer_get_average_loss(void* trainer, const int32_t optimizer_id, double* loss) override;
virtual void trainer_get_average_test_loss(void* trainer, const int32_t optimizer_id, double* loss) override;
virtual void trainer_set_min_learning_rate(void* trainer, const int32_t optimizer_id, const double lr) override;
virtual void trainer_set_mini_batch_size(void* trainer, const int32_t optimizer_id, const unsigned long size) override;
virtual void trainer_be_verbose(void* trainer, const int32_t optimizer_id) override;
virtual void trainer_set_synchronization_file(void* trainer,
const int32_t optimizer_id,
const char* filename,
const int filename_length,
const unsigned long second) override;
virtual void trainer_set_iterations_without_progress_threshold(void* trainer,
const unsigned long thresh) override;
const int32_t optimizer_id,
const unsigned long thresh) override;
virtual void trainer_set_test_iterations_without_progress_threshold(void* trainer,
const unsigned long thresh) override;
const int32_t optimizer_id,
const unsigned long thresh) override;
virtual void trainer_get_net(void* trainer,
const int32_t optimizer_id,
void** ret) override;
virtual void trainer_operator_left_shift(void* trainer, std::ostringstream* stream) override;
virtual void trainer_operator_left_shift(void* trainer, const int32_t optimizer_id, std::ostringstream* stream) override;
virtual void trainer_test_one_step(void* trainer,
const int32_t optimizer_id,
matrix_element_type data_element_type,
void* data,
matrix_element_type label_element_type,
void* labels) override;
virtual void trainer_train(void* trainer,
const int32_t optimizer_id,
matrix_element_type data_element_type,
void* data,
matrix_element_type label_element_type,
void* labels) override;
virtual void trainer_train_one_step(void* trainer,
const int32_t optimizer_id,
matrix_element_type data_element_type,
void* data,
matrix_element_type label_element_type,
Expand Down
Loading