Skip to content

Commit

Permalink
Formatting (#128)
Browse files Browse the repository at this point in the history
  • Loading branch information
sdatkinson authored Oct 19, 2024
1 parent 8807373 commit 596bfed
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
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

0 comments on commit 596bfed

Please sign in to comment.