Skip to content

Commit

Permalink
V1.1.52.dev (#142)
Browse files Browse the repository at this point in the history
* Add v1.1.52, return sp_vec_value_t rather than a Map due to ASAN issues.

* Remove unnecessary alias

* Update sigstore
  • Loading branch information
JamesYang007 authored Feb 22, 2025
1 parent 208d997 commit bf01b97
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
path: dist/
merge-multiple: true
- name: Sign the dists with Sigstore
uses: sigstore/gh-action-sigstore-python@v2.1.1
uses: sigstore/gh-action-sigstore-python@v3.0.0
with:
inputs: >-
./dist/*.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion adelie/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "1.1.51"
__version__ = "1.1.52"

# Set environment flags before loading adelie_core
import os
Expand Down
2 changes: 1 addition & 1 deletion adelie/src/include/adelie_core/solver/solver_base.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ inline void update_screen_derived_base(
// Then, state.dual is going to be super dense and we have 100 rows of such dense vectors.
// Nonetheless, it's still useful to have this for diagnostic purposes... maybe a flag to control whether this gets saved?
template <class StateType, class VecIndexType, class VecValueType>
inline auto sparsify_dual(
inline typename StateType::sp_vec_value_t sparsify_dual(
const StateType& state,
VecIndexType& indices,
VecValueType& values
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ inline void update_solutions(
using state_t = std::decay_t<StateType>;
using vec_index_t = typename state_t::vec_index_t;
using vec_value_t = typename state_t::vec_value_t;
using sp_vec_value_t = typename state_t::sp_vec_value_t;

auto& betas = state.betas;
auto& duals = state.duals;
Expand All @@ -223,8 +222,7 @@ inline void update_solutions(
vec_value_t dual_values;

betas.emplace_back(std::move(state_gaussian_pin_cov.betas.back()));
sp_vec_value_t dual = sparsify_dual(state, dual_indices, dual_values);
duals.emplace_back(std::move(dual));
duals.emplace_back(sparsify_dual(state, dual_indices, dual_values));
intercepts.emplace_back(0);
lmdas.emplace_back(lmda);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ void update_solutions(
using state_t = std::decay_t<StateType>;
using vec_index_t = typename state_t::vec_index_t;
using vec_value_t = typename state_t::vec_value_t;
using sp_vec_value_t = typename state_t::sp_vec_value_t;

const auto y_var = state.y_var;
auto& betas = state.betas;
Expand All @@ -199,8 +198,7 @@ void update_solutions(
vec_value_t dual_values;

betas.emplace_back(std::move(state_gaussian_pin_naive.betas.back()));
sp_vec_value_t dual = sparsify_dual(state, dual_indices, dual_values);
duals.emplace_back(std::move(dual));
duals.emplace_back(sparsify_dual(state, dual_indices, dual_values));
intercepts.emplace_back(state_gaussian_pin_naive.intercepts.back());
lmdas.emplace_back(lmda);

Expand Down
4 changes: 1 addition & 3 deletions adelie/src/include/adelie_core/solver/solver_glm_naive.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ void update_solutions(
using state_t = std::decay_t<StateType>;
using vec_index_t = typename state_t::vec_index_t;
using vec_value_t = typename state_t::vec_value_t;
using sp_vec_value_t = typename state_t::sp_vec_value_t;

const auto loss_null = state.loss_null;
const auto loss_full = state.loss_full;
Expand All @@ -147,8 +146,7 @@ void update_solutions(
vec_value_t dual_values;

betas.emplace_back(std::move(state_gaussian_pin_naive.betas.back()));
sp_vec_value_t dual = sparsify_dual(state, dual_indices, dual_values);
duals.emplace_back(std::move(dual));
duals.emplace_back(sparsify_dual(state, dual_indices, dual_values));
intercepts.emplace_back(state_gaussian_pin_naive.intercepts.back());
lmdas.emplace_back(lmda);

Expand Down

0 comments on commit bf01b97

Please sign in to comment.