Skip to content

Commit 98bf305

Browse files
committed
rename ScaleFeature to ColumnSumNormalize
1 parent 4f23588 commit 98bf305

File tree

94 files changed

+4708
-3330
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+4708
-3330
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,3 +414,7 @@ pip install -e .
414414
| STdGCN | 0.0058/0.0202/NA | 0.0145/0.0261/NA | Test MSE |
415415

416416
**Note**: Stage 1, 2 and 3 (valid pseudo or dataset as metric for selection) for all methods.
417+
418+
### A Note on Function Naming
419+
420+
The function `ScaleFeature` has been renamed to `ColumnSumNormalize` in the code to resolve a naming ambiguity. However, historical WandB logs have not been modified and will still reference the old name (`ScaleFeature`). This is a naming change only and does not affect the program's execution.

dance/modules/single_modality/cell_type_annotation/scheteronet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
from dance.transforms.graph import HeteronetGraph
3737
from dance.transforms.interface import AnnDataTransform
3838
from dance.transforms.misc import Compose, SaveRaw, SetConfig
39-
from dance.transforms.normalize import Log1P, NormalizeTotal, ScaleFeature, UpdateSizeFactors
39+
from dance.transforms.normalize import ColumnSumNormalize, Log1P, NormalizeTotal, UpdateSizeFactors
4040
from dance.typing import Any, LogLevel, Mapping, Optional, Tuple, Union
4141
from dance.utils.metrics import resolve_score_func
4242

dance/modules/spatial/cell_type_deconvo/dstg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
from dance.modules.base import BaseRegressionMethod
2323
from dance.transforms import (
2424
AnnDataTransform,
25+
ColumnSumNormalize,
2526
Compose,
2627
FilterGenesCommon,
2728
PseudoMixture,
2829
RemoveSplit,
29-
ScaleFeature,
3030
SetConfig,
3131
)
3232
from dance.transforms.graph import DSTGraph
@@ -181,7 +181,7 @@ def preprocessing_pipeline(
181181
AnnDataTransform(sc.pp.log1p),
182182
AnnDataTransform(sc.pp.highly_variable_genes, flavor=hvg_flavor, n_top_genes=n_top_genes, batch_key="batch",
183183
subset=True),
184-
ScaleFeature(split_names="ALL", mode="standardize"),
184+
ColumnSumNormalize(split_names="ALL", mode="standardize"),
185185
DSTGraph(k_filter=k_filter, num_cc=num_cc, ref_split="pseudo", inf_split="test"),
186186
SetConfig({
187187
"feature_channel": ["DSTGraph", None],

dance/transforms/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
from dance.transforms.mask import CellwiseMaskData, MaskData
4141
from dance.transforms.misc import AlignMod, Compose, RemoveSplit, SaveRaw, SetConfig, UpdateRaw
4242
from dance.transforms.normalize import (
43+
ColumnSumNormalize,
4344
Log1P,
4445
NormalizePlaceHolder,
4546
NormalizeTotal,
4647
NormalizeTotalLog1P,
47-
ScaleFeature,
4848
ScTransform,
4949
ScTransformR,
5050
UpdateSizeFactors,
@@ -120,7 +120,7 @@
120120
"SaveRaw",
121121
"ScTransform",
122122
"ScTransformR",
123-
"ScaleFeature",
123+
"ColumnSumNormalize",
124124
"SetConfig",
125125
"SpatialIDEFeature",
126126
"TangramFeature",

dance/transforms/normalize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
@register_preprocessor("normalize")
2727
@add_mod_and_transform
28-
class ScaleFeature(BaseTransform):
28+
class ColumnSumNormalize(BaseTransform):
2929
"""Scale the feature matrix in the AnnData object.
3030
3131
This is an extension of :meth:`scanpy.pp.scale`, allowing split- or batch-wide scaling.

examples/atlas/config/atlas_template_yamls/cta_actinn/pipeline_params_tuning_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pipeline:
1818
max_cells: 0.99
1919
- type: normalize
2020
include:
21-
- ScaleFeature
21+
- ColumnSumNormalize
2222
- ScTransform
2323
- Log1P
2424
- NormalizeTotal

examples/atlas/config/atlas_template_yamls/cta_celltypist/pipeline_params_tuning_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pipeline:
1818
max_cells: 0.99
1919
- type: normalize
2020
include:
21-
- ScaleFeature
21+
- ColumnSumNormalize
2222
- ScTransform
2323
- Log1P
2424
- NormalizeTotal

examples/atlas/config/atlas_template_yamls/cta_scdeepsort/pipeline_params_tuning_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pipeline:
1818
max_cells: 0.99
1919
- type: normalize
2020
include:
21-
- ScaleFeature
21+
- ColumnSumNormalize
2222
- ScTransform
2323
- Log1P
2424
- NormalizeTotal

examples/atlas/config/atlas_template_yamls/cta_singlecellnet/pipeline_params_tuning_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pipeline:
1818
max_cells: 0.99
1919
- type: normalize
2020
include:
21-
- ScaleFeature
21+
- ColumnSumNormalize
2222
- ScTransform
2323
- Log1P
2424
- NormalizeTotal

0 commit comments

Comments
 (0)