Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
AKIS Cloud Computing
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Max Melchert
AKIS Cloud Computing
Commits
b09fd4f8
Commit
b09fd4f8
authored
3 months ago
by
Max Melchert
Browse files
Options
Downloads
Patches
Plain Diff
refactor: rename CONDA_PATH to SERVER_CONDA_PATH for clarity
parent
732be769
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/makefile/README.md
+6
-6
6 additions, 6 deletions
src/makefile/README.md
src/makefile/basic.mk
+6
-6
6 additions, 6 deletions
src/makefile/basic.mk
with
12 additions
and
12 deletions
src/makefile/README.md
+
6
−
6
View file @
b09fd4f8
...
...
@@ -132,9 +132,9 @@ Sie werden durch den Aufruf von `make download` im zuvor definierten Ordner `LOC
### Python Environment
| Variable | Verwendung | Beispiel |
| :---------------- | :------------------------------- | :--------------------------------- |
|
`CONDA_PATH`
| Server: Conda-Installations-Pfad |
`/opt/conda`
|
|
`CONDA_ENV`
| Server: Conda-Environment-Pfad |
`~/envs/ml`
|
| :----------------
--
| :------------------------------- | :--------------------------------- |
|
`
SERVER_
CONDA_PATH`
| Server: Conda-Installations-Pfad |
`/opt/conda`
|
|
`
SERVER_
CONDA_ENV`
| Server: Conda-Environment-Pfad |
`~/envs/ml`
|
|
`PYTHON_VERSION`
| Python: Gewünschte Version |
`3.10`
|
|
`PYTHON_PACKAGES`
| Python: Benötigte Pakete |
`tensorflow-cpu matplotlib optuna`
|
...
...
This diff is collapsed.
Click to expand it.
src/makefile/basic.mk
+
6
−
6
View file @
b09fd4f8
...
...
@@ -5,8 +5,8 @@ SERVER_USER := mmustermann
SERVER_HOST
:=
hyrican-1-extern
## Python Environment
CONDA_PATH
:=
/opt/conda
CONDA_ENV
:=
~/envs/ml
SERVER_
CONDA_PATH
:=
/opt/conda
SERVER_
CONDA_ENV
:=
~/envs/ml
PYTHON_VERSION
:=
3.10
PYTHON_PACKAGES
:=
tensorflow-cpu ipympl mypy jupyter pystan
\
matplotlib seaborn scikit-learn openpyxl odfpy pyarrow
\
...
...
@@ -36,8 +36,8 @@ COPY_LINKS_AS_FILES := false
LOGIN
:=
$(
SERVER_USER
)
@
$(
SERVER_HOST
)
SSH
:=
ssh
$(
LOGIN
)
RSYNC
:=
rsync
--archive
--compress
--progress
$(
if
$(
filter
true
,
$(
COPY_LINKS_AS_FILES
))
,--copy-links
)
MAMBA
:=
source
$(
CONDA_PATH
)
/etc/profile.d/conda.sh
&&
mamba
# TODO: mamba.sh
CONDA
:=
source
$(
CONDA_PATH
)
/etc/profile.d/conda.sh
&&
conda
MAMBA
:=
source
$(
SERVER_
CONDA_PATH
)
/etc/profile.d/conda.sh
&&
mamba
# TODO: mamba.sh
CONDA
:=
source
$(
SERVER_
CONDA_PATH
)
/etc/profile.d/conda.sh
&&
conda
.PHONY
:
install upload run kill log download delete
...
...
@@ -46,7 +46,7 @@ help: # list targets and usage
install
:
#
install conda environment
$(
SSH
)
'\
$(
MAMBA
)
create -p
$(
CONDA_ENV
)
python=
$(
PYTHON_VERSION
)
$(
PYTHON_PACKAGES
)
\
$(
MAMBA
)
create -p
$(
SERVER_
CONDA_ENV
)
python=
$(
PYTHON_VERSION
)
$(
PYTHON_PACKAGES
)
\
'
upload
:
#
upload project files from client to server
...
...
@@ -55,7 +55,7 @@ upload: # upload project files from client to server
run
:
#
execute main script on server
$(
SSH
)
'\
cd
$(
REMOTE_PROJECT_DIR
)
;\
$(
CONDA
)
activate
$(
CONDA_ENV
)
;\
$(
CONDA
)
activate
$(
SERVER_
CONDA_ENV
)
;\
python
$(
MAIN_SCRIPT
)
;\
$(
CONDA
)
deactivate;\
'
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment