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

[Chore] Formatting #128

Merged
merged 1 commit into from
Oct 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 3 additions & 3 deletions NAM/convnet.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace convnet
class BatchNorm
{
public:
BatchNorm() {};
BatchNorm(){};
BatchNorm(const int dim, std::vector<float>::iterator& weights);
void process_(Eigen::MatrixXf& input, const long i_start, const long i_end) const;

Expand All @@ -39,7 +39,7 @@ class BatchNorm
class ConvNetBlock
{
public:
ConvNetBlock() {};
ConvNetBlock(){};
void set_weights_(const int in_channels, const int out_channels, const int _dilation, const bool batchnorm,
const std::string activation, std::vector<float>::iterator& weights);
void process_(const Eigen::MatrixXf& input, Eigen::MatrixXf& output, const long i_start, const long i_end) const;
Expand All @@ -55,7 +55,7 @@ class ConvNetBlock
class _Head
{
public:
_Head() {};
_Head(){};
_Head(const int channels, std::vector<float>::iterator& weights);
void process_(const Eigen::MatrixXf& input, Eigen::VectorXf& output, const long i_start, const long i_end) const;

Expand Down
17 changes: 9 additions & 8 deletions NAM/get_dsp.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#include <fstream>

namespace nam {
// Get NAM from a .nam file at the provided location
std::unique_ptr<DSP> get_dsp(const std::filesystem::path config_filename);
namespace nam
{
// Get NAM from a .nam file at the provided location
std::unique_ptr<DSP> get_dsp(const std::filesystem::path config_filename);

// Get NAM from a provided configuration struct
std::unique_ptr<DSP> get_dsp(dspData& conf);
// Get NAM from a provided configuration struct
std::unique_ptr<DSP> get_dsp(dspData& conf);

// Get NAM from a provided .nam file path and store its configuration in the provided conf
std::unique_ptr<DSP> get_dsp(const std::filesystem::path config_filename, dspData& returnedConfig);
}; // namespace nam
// Get NAM from a provided .nam file path and store its configuration in the provided conf
std::unique_ptr<DSP> get_dsp(const std::filesystem::path config_filename, dspData& returnedConfig);
}; // namespace nam
2 changes: 1 addition & 1 deletion NAM/wavenet.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class _Layer
, _input_mixin(condition_size, gated ? 2 * channels : channels, false)
, _1x1(channels, channels, true)
, _activation(activations::Activation::get_activation(activation))
, _gated(gated) {};
, _gated(gated){};
void set_weights_(std::vector<float>::iterator& weights);
// :param `input`: from previous layer
// :param `output`: to next layer
Expand Down
Loading