Introduce _core internal code structure

.github/workflows/run_local_tests.yml

@@ -57,13 +57,13 @@ jobs:
 
       - name: Install ML Runtimes with Smart (with pt and tf)
         if: contains(matrix.os, 'macos')
-        run: smart -v --device cpu
+        run: smart build --device cpu -v
 
       - name: Install ML Runtimes with Smart (with pt tf and onnx support)
         if: contains(matrix.os, 'ubuntu')
-        run: smart -v --device cpu --onnx
+        run: smart build --device cpu --onnx -v
 
       - name: Run Pytest
         run: |
           echo "SMARTSIM_LOG_LEVEL=debug" >> $GITHUB_ENV
-          py.test -s --import-mode=importlib -o log_cli=true
+          py.test -s --import-mode=importlib -o log_cli=true --ignore=test/full_wlm/

.gitignore

@@ -7,14 +7,18 @@ htmlcov
 smartsim.egg-info
 
 # Dependencies
-third-party
+smartsim/_core/.third-party
 
 # Docs
 _build
 
 smartredis
 
-smartsim/bin/redis-server
-smartsim/bin/redis-cli
+# written upon install
+smartsim/version.py
 
-smartsim/lib
+smartsim/_core/bin/redis-server
+smartsim/_core/bin/redis-cli
+
+# created upon install
+smartsim/_core/lib

MANIFEST.in

@@ -1,5 +1,4 @@
 include requirements.txt
-include setup_env.sh
 include Makefile
 graft smartsim/
 

Makefile

@@ -93,33 +93,38 @@ docs:
 # help: cov                            - generate html coverage report for Python client
 .PHONY: cov
 cov:
-		@cd ./tests/ && coverage html
-		@echo if data was present, coverage report is in ./tests/htmlcov/index.html
+	@coverage html
+	@echo if data was present, coverage report is in ./htmlcov/index.html
 
 # help:
 # help: Test
 # help: -------
 
-# help: test                           - Build and run all tests
+# help: test                           - Run all tests
 .PHONY: test
 test:
-	@cd ./tests/; python -m pytest --ignore=full_wlm/
+	@python -m pytest --ignore=tests/full_wlm/
 
-# help: test-verbose                   - Build and run all tests [verbosely]
+# help: test-verbose                   - Run all tests verbosely
 .PHONY: test-verbose
 test-verbose:
-	@cd ./tests/; python -m pytest -vv --ignore=full_wlm/
+	@python -m pytest -vv --ignore=tests/full_wlm/
 
-# help: test-cov                       - run python tests with coverage
+# help: test-debug                     - Run all tests with debug output
+.PHONY: test-debug
+test-debug:
+	@SMARTSIM_LOG_LEVEL=developer python -m pytest -s -o log_cli=true -vv --ignore=tests/full_wlm/
+
+# help: test-cov                       - Run all tests with coverage
 .PHONY: test-cov
 test-cov:
-	@cd ./tests/; python -m pytest --cov=../smartsim -vv --cov-config=${COV_FILE} --ignore=full_wlm/
+	@python -m pytest -vv --cov=./smartsim --cov-config=${COV_FILE} --ignore=tests/full_wlm/
 
 
-# help: test-full                      - run all WLM tests with Python coverage (full test suite)
+# help: test-full                      - Run all WLM tests with Python coverage (full test suite)
 # help:                                  WARNING: do not run test-full on shared systems.
 .PHONY: test-full
 test-full:
-	@cd ./tests/; python -m pytest --cov=../smartsim -vv --cov-config=${COV_FILE}
+	@python -m pytest --cov=./smartsim -vv --cov-config=${COV_FILE}
 
 

conftest.py

@@ -13,7 +13,7 @@
     SrunSettings, AprunSettings,
     JsrunSettings, RunSettings
 )
-from smartsim.config import CONFIG
+from smartsim._core.config import CONFIG
 from smartsim.error import SSConfigError
 
 

pyproject.toml

@@ -26,6 +26,16 @@ log_cli = true
 log_cli_level = "debug"
 
 [tool.isort]
-skip = [
-  "tests/test_configs/circular_config",  # Suppress circular import warning
-]
+# supress circular import warning
+skip = ["tests/test_configs/circular_config"]
+
+[tool.coverage.run]
+source = ["smartsim"]
+# see test_configs/*_cov.cfg for "omit"
+
+[tool.coverage.report]
+ignore_errors = true
+# see test_configs/*_cov.cfg for "exclude_lines"
+
+[tool.coverage.html]
+directory = "htmlcov"

requirements-dev.txt

@@ -4,7 +4,6 @@ redis==3.5.3
 redis-py-cluster==2.1.3
 sphinx==3.1.1
 numpy>=1.18.2
-toml>=0.10.1
 tqdm>=4.50.2
 psutil>=5.7.2
 tabulate>=0.8.9

requirements.txt

@@ -6,4 +6,3 @@ redis==3.5.3
 redis-py-cluster==2.1.3
 numpy>=1.18.2
 tqdm>=4.50.2
-toml>=0.10.1

setup.cfg

@@ -1,6 +1,5 @@
 [metadata]
 name = smartsim
-version = 0.3.2
 description = AI Workflows for Science
 long_description = file: README.md
 long_description_content_type=text/markdown
@@ -30,44 +29,9 @@ setup_requires =
     setuptools>=39.2
     cmake>=3.10
 include_package_data = True
-install_requires =
-    psutil>=5.7.2
-    coloredlogs==10.0
-    tabulate>=0.8.9
-    smartredis>=0.1.1
-    redis-py-cluster==2.1.3
-    redis==3.5.3
-    numpy>=1.18.2
-    tqdm>=4.50.2
-    toml>=0.10.1
-
 python_requires = >=3.7
 
 
-[options.extras_require]
-dev =
-    black>=20.8b1
-    isort>=5.6.4
-    pylint>=2.6.0
-    pytest>=6.0.0
-    pytest-cov>=2.10.1
-
-ml =
-    onnx==1.7.0
-    scikit-learn==0.24.2
-    skl2onnx==1.9.0
-    onnxmltools==1.7.0
-    tensorflow==2.4.2
-
-doc=
-    sphinx==3.1.1
-    breathe==4.27.0
-    sphinx_rtd_theme>=0.5.0
-    sphinx-fortran==1.1.1
-    nbsphinx>=0.8.2
-
-ray=
-    ray>=1.6
 
 [options.packages.find]
 exclude =