Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ requires = [
build-backend = "setuptools.build_meta"

[project]
name = "smlp"
version = "1.0.1"
name = "smlptech"
version = "1.0.2"
description = "SMLP - The Symbolic Machine Learning Prover"
readme = "README.md"
requires-python = "==3.11.*"
dependencies = [
"blosc2",
Expand Down
8 changes: 4 additions & 4 deletions scripts/bin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ All `enter*` commands mentioned below create `$HOME/shared` directory and mount

| Repository | Tag | Image Index Digest |
|--------------------------------------------------|-------|-------------|
| mdmitry1/smlp-test-build-opensuse\_15.5-python311 | latest | sha256:ca6725b46ce9 |
| mdmitry1/smlp-test-build-almalinux\_9-python311 | latest | sha256:82ae0eeb8ac8 |
| mdmitry1/smlp-test-build-ubuntu\_22.04-python311 | latest | sha256:11ab93a137dc |
| mdmitry1/python311-dev | latest | sha256:887dc7086b5d |
| mdmitry1/smlp-test-build-almalinux\_9-python311 | latest | sha256:4c17ef42dc8c |
| mdmitry1/smlp-test-build-opensuse\_15.5-python311 | latest | sha256:6f27caef60b0 |
| mdmitry1/smlp-test-build-ubuntu\_22.04-python311 | latest | sha256:bbd984c96074 |
| mdmitry1/python311-dev | latest | sha256:dcb64c8194fb |

GUI and data sharing is supported for container `mdmitry1/python311-dev:latest` only.
Virtual display is supported for all containers.
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ RUN cd /app && ./run_git_clone $GIT_BRANCH
# ---------------------------------------------------------------------------
# 5. Install smlp from wheel
# ---------------------------------------------------------------------------
RUN python3.11 -m pip install /app/smlp/scripts/dist/smlp-1.0.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl
RUN python3.11 -m pip install /app/smlp/scripts/dist/smlptech-1.0.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl

# ---------------------------------------------------------------------------
# 6. Configure UTF-8 locale
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ RUN cd /app && ./run_git_clone $GIT_BRANCH
# ---------------------------------------------------------------------------
# 5. Install smlp from wheel
# ---------------------------------------------------------------------------
RUN python3.11 -m pip install /app/smlp/scripts/dist/smlp-1.0.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl
RUN python3.11 -m pip install /app/smlp/scripts/dist/smlptech-1.0.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl

# ---------------------------------------------------------------------------
# 6. Configure UTF-8 locale
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ RUN cd /app && ./run_git_clone $GIT_BRANCH
# ---------------------------------------------------------------------------
# 5. Install smlp from wheel
# ---------------------------------------------------------------------------
RUN python3.11 -m pip install /app/smlp/scripts/dist/smlp-1.0.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl
RUN python3.11 -m pip install /app/smlp/scripts/dist/smlptech-1.0.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl

# ---------------------------------------------------------------------------
# 6. Install UTF-8 fonts
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ DOCKERFILE := Dockerfile.$(IMAGE)
GIT_BRANCH := $(shell git branch --show-current)
SMLP_COMMIT := $(shell git ls-remote https://github.com/SMLP-Systems/smlp.git refs/heads/$(GIT_BRANCH) | cut -f1)

WHEEL_SRC := /app/smlp/dist/smlp-1.0.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl
WHEEL_SRC := /app/smlp/dist/smlptech-1.0.2-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl
WHEEL_DST := ../dist

define copy_out
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/repair_wheel.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def main():
print("Install with: python3 -m pip install auditwheel patchelf")
sys.exit(1)

wheels = sorted(dist_dir.glob("smlp-*linux_x86_64.whl"), key=lambda p: p.stat().st_mtime)
wheels = sorted(dist_dir.glob("smlptech-*linux_x86_64.whl"), key=lambda p: p.stat().st_mtime)
if not wheels:
print(f"ERROR: No linux_x86_64 wheel found in {dist_dir}/")
sys.exit(1)
Expand Down
2 changes: 1 addition & 1 deletion scripts/venv/run_dora
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ mathsat_src_dir=scripts/docker/external
$(dirname $mathsat_src_dir)/run_mathsat_build
\rm -rf $mathsat_dest_dir > /dev/null
\mv $mathsat_src_dir $mathsat_dest_dir
pip install ../../../dist/smlp-1.0.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl
pip install ../../../dist/smlptech-1.0.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl
sed -i.bak "s@../../src/run_smlp.py@smlp@" regr_smlp/code/smlp_regr.py
cd regr_smlp/code
smlp -data "../data/smlp_toy_num_resp_mult.csv" -out_dir ./ -pref Test1 -mode train -resp y1 -feat x,p1,p2 -model dt_caret -save_model_config f -mrmr_pred 0 -plots t -seed 10 -log_time f
Expand Down
2 changes: 1 addition & 1 deletion tests/install/test_container_install
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ log=$(realpath $0 | xargs basename).$(echo $image | tr / _ | cut -d: -f1).log
success=0
if [[ "$image" == *wheel* ]]; then
docker run --rm $image /bin/bash -c \
'auditwheel show dist/smlp-1.0.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl \
'auditwheel show dist/smlptech-1.0.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl \
| grep -B1 -A1 consistent |& tr "\012" " "' &> $log
echo "" >> $log
if [ "1" -eq $(grep -c consistent $log) ]; then
Expand Down
11 changes: 11 additions & 0 deletions tests/install/test_matplotlib_backend
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env bash
script_path=$(realpath $0 | xargs dirname)
i=1
for image in $(docker images --format table | awk '{print $1}' | egrep "smlp|dev" | grep python311 | egrep -v "wheel|test\-build"); do
echo $i $image matplotlib backend for VNC server: $(docker run -e DISPLAY=:99 -p 5900:5900 --rm -v $script_path/test_matplotlib_in_vnc:/test_matplotlib $image /test_matplotlib)
(( i++ ))
done
for image in $(docker images --format table | awk '{print $1}' | egrep "smlp|dev" | grep python311 | grep -v wheel); do
echo $i $image matplotlib backend for virtual display: $(docker run --rm -v $script_path/test_matplotlib_in_virtual_display:/test_matplotlib $image /test_matplotlib)
(( i++ ))
done
2 changes: 2 additions & 0 deletions tests/install/test_matplotlib_in_virtual_display
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/usr/bin/env bash
./open_virtual_display && env DISPLAY=:99 python3 -c "import matplotlib; print(matplotlib.get_backend())"
2 changes: 2 additions & 0 deletions tests/install/test_matplotlib_in_vnc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/usr/bin/env bash
./start_vnc && python3 -c "import matplotlib; print(matplotlib.get_backend())"
12 changes: 11 additions & 1 deletion tests/smlp_regression/run_smlp_regression
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/tcsh -f
onintr cleanup
set script_path=`realpath $0 | xargs dirname`
set script_name=`realpath $0 | xargs basename`
set log=$PWD/${script_name}.log
Expand All @@ -22,5 +23,14 @@ echo "Log file: $log"
if(! $?DISPLAY ) then
setenv DISPLAY :99
endif
echo n | env CUDA_VISIBLE_DEVICES=-1 ./smlp_regr.py -w 8 -def n -t all -tol 7 -g |& tee $log
set python3_version=`python3 -c 'from sys import version_info; print(version_info.minor)'`
set local_script=`echo smlp_regr.py | sed 's/regr/regr_local/'`
if( $python3_version != 11 ) then
\rm -f $local_script >& /dev/null
sed 's@../../src/run_smlp.py@smlp@' smlp_regr.py > $local_script
chmod +x $local_script
endif
echo n | env CUDA_VISIBLE_DEVICES=-1 ./${local_script} -w 8 -def n -t all -tol 7 -g |& tee $log
${script_path}/create_diff_report >& $diff_report
cleanup:
\rm -f $local_script >& /dev/null
Loading