Skip to content

Commit

Permalink
Merge pull request #84 from fogg-lab/release-1.0.6
Browse files Browse the repository at this point in the history
Release 1.0.6
  • Loading branch information
wigginno authored Jul 29, 2024
2 parents 6a73a70 + 4264fdc commit 35787f9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,10 @@ An application for automated high-throughput analysis of cancer and endothelial
For a detailed description of analysis capabilities, see the [capabilities overview notebook](notebooks/capabilities_overview.ipynb).

## Setup Option 1: Graphical User Interface (GUI)

*This option is currently available for Windows users only. Linux and macOS users are encouraged to install the CLI tools.*
1. Navigate to the latest release on the [releases page](https://github.com/fogg-lab/tissue-model-analysis-tools/releases).
2. Under "Assets", download the zip file that corresponds to your system.
- Windows: tmat-win64.zip
- MacOS (Intel CPU): tmat-macos.zip (Not added to the release yet. Will add soon)
- MacOS (Apple Silicon): tmat-macos-arm64.zip (Also will be added soon)
- Linux: tmat-linux64.zip
3. Extract the contents of the zip file to any location on your system (e.g. Desktop). Make sure you use the extract button (or similar, e.g. "extract all" or "extract to") intead of manually dragging files out of the zip file. To use the tools to analyze your images, open the `tmat` program stored within the extracted folder and follow the guidance on-screen (see the [Usage](#usage) section for more info).
2. Under "Assets", download the tmat-win64.zip file.
3. Extract the contents of the zip file to any location on your system (e.g. Desktop). Make sure you use the extract button ("extract all" or "extract to") intead of manually dragging files out of the zip file. To use the tools to analyze your images, open the `tmat` program stored within the extracted folder and follow the guidance on-screen (see the [Usage](#usage) section for more info).

## Setup Option 2: Command Line Interface (CLI)

Expand Down
6 changes: 3 additions & 3 deletions notebooks/analysis_demo.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -324,15 +324,15 @@
" import google.colab\n",
" !apt -qq install -y python3.10\n",
" !apt -qq install -y pipx\n",
" !wget https://github.com/fogg-lab/tissue-model-analysis-tools/releases/latest/download/fl_tissue_model_tools-1.0.5-py3-none-any.whl\n",
" !wget https://github.com/fogg-lab/tissue-model-analysis-tools/releases/latest/download/fl_tissue_model_tools-1.0.6-py3-none-any.whl\n",
"\n",
" import tensorflow as tf\n",
" if tf.config.list_physical_devices(\"GPU\"):\n",
" print(\"GPU is available in the runtime\")\n",
" !pipx install \"./fl_tissue_model_tools-1.0.5-py3-none-any.whl[and-cuda]\" --python $(which python3.10)\n",
" !pipx install \"./fl_tissue_model_tools-1.0.6-py3-none-any.whl[and-cuda]\" --python $(which python3.10)\n",
" else:\n",
" !echo \"WARNING: GPU is not available in the runtime. Proceeding with CPU-only installation.\"\n",
" !pipx install ./fl_tissue_model_tools-1.0.5-py3-none-any.whl --python $(which python3.10)\n",
" !pipx install ./fl_tissue_model_tools-1.0.6-py3-none-any.whl --python $(which python3.10)\n",
"\n",
" !ln -s /root/.local/bin/tmat /usr/bin/tmat\n",
" !tmat configure /content/fl_tissue_model_tools\n",
Expand Down

0 comments on commit 35787f9

Please sign in to comment.