Skip to content

Commit

Permalink
Merge pull request #64 from hpages/devel
Browse files Browse the repository at this point in the history
Resync with recent developments in SparseArray/DelayedArray packages
  • Loading branch information
const-ae committed Jul 22, 2024
2 parents fda86ee + ace2c7e commit 21e9908
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: glmGamPoi
Type: Package
Title: Fit a Gamma-Poisson Generalized Linear Model
Version: 1.17.3
Version: 1.17.4
Authors@R: c(person("Constantin", "Ahlmann-Eltze", email = "artjom31415@googlemail.com",
role = c("aut", "cre"), comment = c(ORCID = "0000-0002-3762-068X")),
person("Nathan", "Lubock", email="lubock.nathan@gmail.com", role = "ctb",
Expand Down Expand Up @@ -43,6 +43,7 @@ Imports:
DelayedMatrixStats,
matrixStats,
MatrixGenerics,
SparseArray (>= 1.5.21),
DelayedArray,
HDF5Array,
SummarizedExperiment,
Expand Down
2 changes: 1 addition & 1 deletion R/estimate_size_factors.R
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ combine_size_factors_and_offset <- function(offset, size_factors, Y, verbose = F
stopifnot(length(offset) == 1 || length(offset) == n_samples)
zero_offset <- all(offset == 0)
if(make_offset_hdf5_mat){
offset_matrix <- DelayedArray::DelayedArray(DelayedArray::SparseArraySeed(c(n_genes, n_samples)))
offset_matrix <- DelayedArray::DelayedArray(SparseArray::COO_SparseArray(c(n_genes, n_samples)))
offset_matrix <- add_vector_to_each_row(offset_matrix, offset)
}else{
offset_matrix <- matrix(offset, nrow=n_genes, ncol = n_samples, byrow = TRUE)
Expand Down

0 comments on commit 21e9908

Please sign in to comment.