Skip to content

Commit

Permalink
changing name to pytom-match-pick from pytom-template-matching-gpu (#126
Browse files Browse the repository at this point in the history
)

* Update pyproject.toml

* Update README.md

* Update __init__.py

* get version from __init__ in tmjob

* update badge in readme
  • Loading branch information
McHaillet authored Feb 27, 2024
1 parent a8f0ffe commit de1141e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![test-badge](https://github.com/SBC-Utrecht/pytom-template-matching-gpu/actions/workflows/unit-tests.yml/badge.svg?branch=main)
![test-badge](https://github.com/SBC-Utrecht/pytom-match-pick/actions/workflows/unit-tests.yml/badge.svg?branch=main)
# PyTOM GPU template matching for cryo-ET
PyTOM's GPU template matching as a single pip plugin that can only be run from the command line.

Expand Down Expand Up @@ -39,8 +39,8 @@ conda activate pytom_tm
Then clone the repository and install it with pip (building cupy can take a while!):

```commandline
git clone https://github.com/SBC-Utrecht/pytom-template-matching-gpu.git
cd pytom-template-matching-gpu
git clone https://github.com/SBC-Utrecht/pytom-match-pick.git
cd pytom-match-pick
python -m pip install '.[plotting]'
```

Expand Down Expand Up @@ -73,9 +73,9 @@ specific build compatible with the installed cuda toolkit.

## Usage

Detailed usage instructions are available on the wiki: https://github.com/SBC-Utrecht/pytom-template-matching-gpu/wiki
Detailed usage instructions are available on the wiki: https://github.com/SBC-Utrecht/pytom-match-pick/wiki

Also, a tutorial can be found on the same wiki: https://github.com/SBC-Utrecht/pytom-template-matching-gpu/wiki/Tutorial
Also, a tutorial can be found on the same wiki: https://github.com/SBC-Utrecht/pytom-match-pick/wiki/Tutorial

The following scripts are available to run with `--help` to see parameters:

Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ requires = ["setuptools"]
build-backend = "setuptools.build_meta"

[project]
name = "pytom-template-matching-gpu"
name = "pytom-match-pick"
version = "0.3.5"
description = "GPU template matching from PyTOM as a lightweight pip package"
description = "PyTOM's GPU template matching module as an independent package"
readme = "README.md"
license = {file = "LICENSE"}
authors = [
Expand Down Expand Up @@ -51,8 +51,8 @@ plotting = ["matplotlib", "seaborn"]
"pytom_estimate_roc.py" = "pytom_tm.entry_points:estimate_roc [plotting]"

[project.urls]
Repository = "https://github.com/SBC-Utrecht/pytom-template-matching-gpu"
Issues = "https://github.com/SBC-Utrecht/pytom-template-matching-gpu/issues"
Repository = "https://github.com/SBC-Utrecht/pytom-match-pick"
Issues = "https://github.com/SBC-Utrecht/pytom-match-pick/issues"

[tool.setuptools]
packages = ["pytom_tm", "pytom_tm.angle_lists"]
Expand Down
2 changes: 1 addition & 1 deletion src/pytom_tm/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from importlib import metadata
__version__ = metadata.version('pytom-template-matching-gpu')
__version__ = metadata.version('pytom-match-pick')

try:
import cupy
Expand Down
3 changes: 2 additions & 1 deletion src/pytom_tm/tmjob.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from pytom_tm.matching import TemplateMatchingGPU
from pytom_tm.weights import create_wedge, power_spectrum_profile, profile_to_weighting, create_gaussian_band_pass
from pytom_tm.io import read_mrc_meta_data, read_mrc, write_mrc, UnequalSpacingError
from pytom_tm import __version__ as PYTOM_TM_VERSION


def load_json_to_tmjob(file_name: pathlib.Path, load_for_extraction: bool = True) -> TMJob:
Expand Down Expand Up @@ -101,7 +102,7 @@ def __init__(
ctf_data: Optional[list[dict, ...]] = None,
whiten_spectrum: bool = False,
rotational_symmetry: int = 1,
pytom_tm_version_number: str = metadata.version('pytom-template-matching-gpu'),
pytom_tm_version_number: str = PYTOM_TM_VERSION,
job_loaded_for_extraction: bool = False,
):
"""
Expand Down

0 comments on commit de1141e

Please sign in to comment.