Skip to content

Commit

Permalink
Work toward sigmoid
Browse files Browse the repository at this point in the history
  • Loading branch information
@dannys4
dannys4 committed Sep 12, 2023
1 parent e52fb11 commit fd09255
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 21 deletions.
35 changes: 27 additions & 8 deletions MParT/Sigmoid.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ struct Logistic {
};

template<typename MemorySpace, typename SigmoidType>
class Sigmoid: public ParameterizedFunctionBase<MemorySpace>
class Sigmoid1d: public ParameterizedFunctionBase<MemorySpace>
{
public:
Sigmoid(StridedVector<const double, MemorySpace> centers, StridedVector<const double, MemorySpace> widths): ParameterizedFunctionBase<MemorySpace>(1, 1, widths.extent(0))
Sigmoid1d(StridedVector<const double, MemorySpace> centers, StridedVector<const double, MemorySpace> widths): ParameterizedFunctionBase<MemorySpace>(1, 1, widths.extent(0))
{
if(centers.extent(0) != widths.extent(0)) {
std::stringstream ss;
Expand All @@ -44,16 +44,35 @@ class Sigmoid: public ParameterizedFunctionBase<MemorySpace>
}

void EvaluateImpl(StridedMatrix<const double, MemorySpace> const& pts, StridedMatrix<double, MemorySpace> out) override {
auto policy = Kokkos::RangePolicy<typename MemoryToExecution<MemorySpace>::Space>(0,pts.extent(1));
Kokkos::parallel_for(policy, KOKKOS_CLASS_LAMBDA (unsigned int pointInd) {
out(0,pointInd) = SigmoidType::Evaluate(pts(0,pointInd));
Kokkos::parallel_for(pts.extent(1), KOKKOS_CLASS_LAMBDA (unsigned int pointInd) {
double eval_pt = 0.;
for(int coeff_index = 0; coeff_index < this->numCoeffs; coeff_index++){
eval_pt += this->savedCoeffs(coeff_index)*SigmoidType::Evaluate(pts(0,pointInd));
}
out(0,pointInd) = eval_pt;
});
}
void GradientImpl(StridedMatrix<const double, MemorySpace> const& sens, StridedMatrix<const double, MemorySpace> const& pts, StridedMatrix<double, MemorySpace> out) override {}
void CoeffGradImpl(StridedMatrix<const double, MemorySpace> const& sens,StridedMatrix<const double, MemorySpace> const& pts, StridedMatrix<double, MemorySpace> out) override {}

private:
void GradientImpl(StridedMatrix<const double, MemorySpace> const& sens, StridedMatrix<const double, MemorySpace> const& pts, StridedMatrix<double, MemorySpace> out) override {
Kokkos::MDRangePolicy<Kokkos::Rank<2>, ExecutionSpace> policy ({0,0},{this->numCoeffs, (int) pts.extent(1)});
Kokkos::parallel_for(pts.extent(1), KOKKOS_CLASS_LAMBDA(unsigned int sample_index) {
double grad_pt = 0.;
for(int coeff_index = 0; coeff_index < this->numCoeffs; coeff_index++){
grad_pt += this->savedCoeffs(coeff_index)*SigmoidType::Derivative(pts(0,sample_index));
}
out(0,sample_index) = sens(0,sample_index)*grad_pt;
});
}

void CoeffGradImpl(StridedMatrix<const double, MemorySpace> const& sens,StridedMatrix<const double, MemorySpace> const& pts, StridedMatrix<double, MemorySpace> out) override {
Kokkos::MDRangePolicy<Kokkos::Rank<2>, ExecutionSpace> policy ({0,0}, {this->numCoeffs, (int)sens.extent(1)});
Kokkos::parallel_for(policy, KOKKOS_CLASS_LAMBDA(unsigned int coeff_index, unsigned int sample_index) {
out(coeff_index,sample_index) = sens(0,sample_index)*SigmoidType::Evaluate(pts(0,sample_index));
});
}

private:
using ExecutionSpace = typename MemoryToExecution<MemorySpace>::Space;
};
}

Expand Down
57 changes: 44 additions & 13 deletions tests/Test_Sigmoid.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,64 @@ using namespace Catch;
using MemorySpace = Kokkos::HostSpace;


TEMPLATE_TEST_CASE("Sigmoid","[sigmoid]", Logistic) {
TEMPLATE_TEST_CASE("Sigmoid1d","[sigmoid1d]", Logistic) {
SECTION("Initialization") {
Kokkos::View<double*, MemorySpace> centers("Sigmoid Centers", 2);
Kokkos::View<double*, MemorySpace> widths("Sigmoid Centers", 1);

CHECK_THROWS_AS((Sigmoid<MemorySpace,TestType>(centers, widths)), std::invalid_argument);
CHECK_THROWS_AS((Sigmoid1d<MemorySpace,TestType>(centers, widths)), std::invalid_argument);
}
SECTION("Single Sigmoid") {
Kokkos::View<double*, MemorySpace> center("Sigmoid Centers", 1);
Kokkos::View<double*, MemorySpace> width("Sigmoid Centers", 1);
Kokkos::View<double*, MemorySpace> coeff("Sigmoid coeff", 1);
center(0) = 0; width(0) = 1; coeff(0) = 1.0;
Sigmoid<MemorySpace,TestType> Sigmoid (center, width);
Sigmoid.SetCoeffs(coeff);
Kokkos::View<double**, MemorySpace> evalPts("Input point", 1, 3);
evalPts(0,0) = -100; evalPts(0,1) = 0.0; evalPts(0,2) = 100;
StridedMatrix<double,MemorySpace> out = Sigmoid.Evaluate(evalPts);
double approxTol = 1e-5;
REQUIRE_THAT(out(0,0), Matchers::WithinAbs(0.0, approxTol));
REQUIRE_THAT(out(0,1), Matchers::WithinAbs(0.5, approxTol));
REQUIRE_THAT(out(0,2), Matchers::WithinAbs(1.0, approxTol));
center(0) = 0; width(0) = 1;
Sigmoid1d<MemorySpace,TestType> Sigmoid (center, width);
for(int coeff_int = 1; coeff_int <= 2; coeff_int++) {
coeff(0) = (double) coeff_int;
Sigmoid.WrapCoeffs(coeff);
Kokkos::View<double**, MemorySpace> evalPts("Input point", 1, 3);
evalPts(0,0) = -100; evalPts(0,1) = 0.0; evalPts(0,2) = 100;
StridedMatrix<double,MemorySpace> out = Sigmoid.Evaluate(evalPts);
double approxTol = 1e-5;
REQUIRE_THAT(out(0,0), Matchers::WithinAbs(coeff_int*0.0, approxTol));
REQUIRE_THAT(out(0,1), Matchers::WithinAbs(coeff_int*0.5, approxTol));
REQUIRE_THAT(out(0,2), Matchers::WithinAbs(coeff_int*1.0, approxTol));
}

unsigned int N_grad_points = 100;
double fd_delta = 1e-5;
Kokkos::View<double**, MemorySpace> gradPts("Gradient points", 1, N_grad_points);
Kokkos::View<double**, MemorySpace> gradPts_plus_delta("Gradient points plus delta", 1, N_grad_points);
Kokkos::View<double**, MemorySpace> sens("Sensitivities", 1, N_grad_points);
Kokkos::parallel_for(N_grad_points, KOKKOS_LAMBDA(unsigned int point_index) {
double gradPt = 3.0*(-1.0 + 2*((double) point_index)/((double) N_grad_points-1));
double sensPt = 2.0 + ((double) point_index)/((double) N_grad_points-1);
gradPts(0,point_index) = gradPt;
gradPts_plus_delta(0,point_index) = gradPt + fd_delta;
sens(0,point_index) = sensPt;
});
Kokkos::View<double**, MemorySpace> input_grad = Sigmoid.Gradient(sens, gradPts);
Kokkos::View<double**, MemorySpace> coeff_grad = Sigmoid.CoeffGrad(sens, gradPts);
Kokkos::View<double**, MemorySpace> gradPts_eval = Sigmoid.Evaluate(gradPts);
Kokkos::View<double**, MemorySpace> gradPts_plus_delta_eval = Sigmoid.Evaluate(gradPts_plus_delta);
coeff(0) += fd_delta;
Kokkos::View<double**, MemorySpace> gradPts_plus_coeff_delta_eval = Sigmoid.Evaluate(gradPts);
double input_grad_error_accumulator = 0., coeff_grad_error_accumulator = 0.;
for(int i = 0; i < N_grad_points; i++) {
double input_grad_i_fd = (gradPts_plus_delta_eval(0,i) - gradPts_eval(0,i))/fd_delta;
double coeff_grad_i_fd = (gradPts_plus_coeff_delta_eval(0,i) - gradPts_eval(0,i))/fd_delta;
input_grad_error_accumulator += fabs(input_grad_i_fd*sens(0,i) - input_grad(0,i));
coeff_grad_error_accumulator += fabs(coeff_grad_i_fd*sens(0,i) - coeff_grad(0,i));
}
CHECK(input_grad_error_accumulator < N_grad_points*2*fd_delta);
CHECK(coeff_grad_error_accumulator < N_grad_points*2*fd_delta);
}
SECTION("Multiple Sigmoids") {
int N_Sigmoid = 3;
Kokkos::View<double*, MemorySpace> centers("Sigmoid Centers", N_Sigmoid);
Kokkos::View<double*, MemorySpace> widths("Sigmoid Centers", N_Sigmoid);
Sigmoid<MemorySpace,TestType> Sigmoid (centers, widths);
Sigmoid1d<MemorySpace,TestType> Sigmoid (centers, widths);
Kokkos::View<double*, MemorySpace> coeffs("Sigmoid Coefficients", N_Sigmoid);
for(int j = 0; j < N_Sigmoid; j++) coeffs(j) = 0.5*(j+1);
Sigmoid.WrapCoeffs(coeffs);
Expand Down

0 comments on commit fd09255

Please sign in to comment.