Skip to content

fix build #411

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

Merged
danielnachun merged 2 commits into from
Sep 3, 2025
Merged

fix build #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ee0b40
fix build
danielnachun Sep 3, 2025
1fe6291
fix build
danielnachun Sep 3, 2025
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
4 changes: 2 additions & 2 deletions src/Makevars.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CXX_STD = CXX11
CXX_STD = CXX14
GSL_LIBS = @GSL_LIBS@
GSL_CFLAGS = @GSL_CFLAGS@
PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) $(GSL_CFLAGS) -DARMA_64BIT_WORD=1 -DHAVE_WORKING_LOG1P -DSIMDE_ENABLE_NATIVE_ALIASES
PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) $(GSL_CFLAGS) -DARMA_64BIT_WORD=1 -DSIMDE_ENABLE_NATIVE_ALIASES
PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) \
$(FLIBS) $(LDFLAGS) $(GSL_LIBS)
4 changes: 2 additions & 2 deletions src/mr_ash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <armadillo>
#include <current/armadillo>
#include <cmath>
#include <vector>
#include <string>
Expand Down Expand Up @@ -314,4 +314,4 @@ unordered_map<string, mat> mr_ash_rss(const vec& bhat, const vec& shat, const ve

return {{"mu1", result["mu1"]}, {"sigma2_1", result["sigma2_1"]}, {"w1", result["w1"]},
{"sigma2_e", result["sigma2_e"]}, {"w0", result["w0"]}, {"ELBO", result["ELBO"]}};
};
};
4 changes: 2 additions & 2 deletions src/prscs_mcmc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#ifndef MCMC_HPP
#define MCMC_HPP

#include <armadillo>
#include <current/armadillo>
#include <vector>
#include <string>
#include <cmath>
Expand Down Expand Up @@ -316,4 +316,4 @@ std::map<std::string, arma::vec> prs_cs_mcmc(double a, double b, double* phi,

return output;
}
#endif // MCMC_HPP
#endif // MCMC_HPP
4 changes: 2 additions & 2 deletions src/sdpr_mcmc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <iostream>
#include <vector>
#include <armadillo>
#include <current/armadillo>
#include <cmath>
#include <random>
#include <unordered_map>
Expand Down Expand Up @@ -254,4 +254,4 @@ std::unordered_map<std::string, arma::vec> mcmc(
unsigned n_threads,
int opt_llk,
bool verbose
);
);
Loading