diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5cda66d..751d955 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -47,7 +47,7 @@ repos: name: Disallow improper capitalization language: pygrep entry: PyBind|Numpy|Cmake|CCache|Github|PyTest - exclude: ^(.pre-commit-config.yaml|content/week05/precommit.md)$ + exclude: ^(.pre-commit-config.yaml|content/week05_package/precommit.md)$ - repo: https://github.com/PrincetonUniversity/blocklint rev: v0.2.5 diff --git a/_toc.yml b/_toc.yml index 56bf5e0..74ae2ed 100644 --- a/_toc.yml +++ b/_toc.yml @@ -6,83 +6,83 @@ root: content/intro parts: - caption: "Week 1: Intro" chapters: - - file: content/week01/intro.md - - file: content/week01/setup.md - - file: content/week01/vcs.md - - file: content/week01/programming_basics.ipynb - - file: content/week01/practices.md - - file: content/week01/cleanup_bessel.ipynb + - file: content/week01_intro/intro.md + - file: content/week01_intro/setup.md + - file: content/week01_intro/vcs.md + - file: content/week01_intro/programming_basics.ipynb + - file: content/week01_intro/practices.md + - file: content/week01_intro/cleanup_bessel.ipynb - caption: "Week 2: Version Control" chapters: - - file: content/week02/intro.md - - file: content/week02/first_steps.md - - file: content/week02/advanced_steps.md + - file: content/week02_git/intro.md + - file: content/week02_git/first_steps.md + - file: content/week02_git/advanced_steps.md - caption: "Week 3: Testing" chapters: - - file: content/week03/python_setup.md - - file: content/week03/testing.md - - file: content/week03/pytest.md - - file: content/week03/tdd.md - - file: content/week03/debugging.md + - file: content/week03_testing/python_setup.md + - file: content/week03_testing/testing.md + - file: content/week03_testing/pytest.md + - file: content/week03_testing/tdd.md + - file: content/week03_testing/debugging.md - caption: "Week 4: Continuous Integration" chapters: - - file: content/week04/ci.md - - file: content/week04/cd.md - - file: content/week04/docs.md + - file: content/week04_ci/ci.md + - file: content/week04_ci/cd.md + - file: content/week04_ci/docs.md - caption: "Week 5: Packaging and Quality Control" chapters: - - file: content/week05/packaging.md - - file: content/week05/using_packages.md - - file: content/week05/making_a_package.md - - file: content/week05/precommit.md - - file: content/week05/task_runners.md + - file: content/week05_package/packaging.md + - file: content/week05_package/using_packages.md + - file: content/week05_package/making_a_package.md + - file: content/week05_package/precommit.md + - file: content/week05_package/task_runners.md - caption: "Week 6: Object Oriented design" chapters: - - file: content/week06/introoo.md - - file: content/week06/oodesign.md + - file: content/week06_oop/introoo.md + - file: content/week06_oop/oodesign.md - caption: "Week 7: Design Patterns" chapters: - - file: content/week07/designpatt.md - - file: content/week07/functional.md + - file: content/week07_design/designpatt.md + - file: content/week07_design/functional.md - caption: "Week 8: Static Typing" chapters: - - file: content/week08/typing.md + - file: content/week08_static_typing/typing.md - caption: "Week 9: Mixing Languages" chapters: - - file: content/week09/01-shared-objects/01-shared-objects.ipynb - - file: content/week09/02-cpython/02-cpython.ipynb - - file: content/week09/03-pybind/03a-pybind.ipynb - - file: content/week09/03-pybind/03b-pybind.ipynb - - file: content/week09/06-rust.md + - file: content/week09_binding/01-shared-objects/01-shared-objects.ipynb + - file: content/week09_binding/02-cpython/02-cpython.ipynb + - file: content/week09_binding/03-pybind/03a-pybind.ipynb + - file: content/week09_binding/03-pybind/03b-pybind.ipynb + - file: content/week09_binding/06-rust.md - caption: "Week 10: Intro to Compilation" chapters: - - file: content/week10/Compiled_Languages.ipynb - - file: content/week10/rust_example/compiled.md - - file: content/week10/rust_example/rust.md - - file: content/week10/debugging.md - - file: content/week10/profiling.md + - file: content/week10_compiled/Compiled_Languages.ipynb + - file: content/week10_compiled/rust_example/compiled.md + - file: content/week10_compiled/rust_example/rust.md + - file: content/week10_compiled/debugging.md + - file: content/week10_compiled/profiling.md - caption: "Week 11: Parallel Computing" chapters: - - file: content/week11/intro.md - - file: content/week11/openmp.md - - file: content/week11/threading.md - - file: content/week11/concepts.md + - file: content/week11_omp/intro.md + - file: content/week11_omp/openmp.md + - file: content/week11_omp/threading.md + - file: content/week11_omp/concepts.md - caption: "Week 12: Distributed Computing" chapters: - - file: content/week12/mpi.md + - file: content/week12_mpi/mpi.md - caption: "Bonus: Exotic topics" chapters: - - file: content/week13/webassembly.md - - file: content/week13/shell.md + - file: content/week13_misc/webassembly.md + - file: content/week13_misc/shell.md diff --git a/content/week01_intro/cleanup_bessel.ipynb b/content/week01_intro/cleanup_bessel.ipynb index 856bcd2..ccba6e7 100644 --- a/content/week01_intro/cleanup_bessel.ipynb +++ b/content/week01_intro/cleanup_bessel.ipynb @@ -20,25 +20,28 @@ "from numpy import *\n", "import matplotlib.pyplot as plt\n", "\n", - "Xmax = 40.\n", + "Xmax = 40.0\n", "Xmin = 0.25\n", - "step = 0.1 # Global class variables\n", - "order = 10; start = 50 # Plot j_order\n", - "graph1, ax1 = plt.subplots(figsize = (5, 5))\n", - "ax1.set_title('Sperical Bessel, \\\n", - " L = 1 (red), 10')\n", - "ax1.set_xlabel(\"x\"); ax1.set_ylabel('j(x)')\n", - "ax1.set_xlim(left=Xmin , \\\n", - " right=Xmax)\n", - "ax1.set_ylim(bottom=-0.2 , top=0.5)\n", - "\n", - "\n", - "def down(x, n, m): # Method down, recurs downward\n", - " j = zeros( (start + 2), float)\n", - " j[m + 1] = j[m] = 1. # Start with anything\n", - " for k in range(m, 0, -1):\n", - " j[k - 1] = ( (2.*k + 1.)/x)*j[k] - j[k + 1]\n", - " scale = (sin(x)/x)/j[0] # Scale solution to known j[0]\n", + "step = 0.1 # Global class variables\n", + "order = 10\n", + "start = 50 # Plot j_order\n", + "graph1, ax1 = plt.subplots(figsize=(5, 5))\n", + "ax1.set_title(\n", + " \"Spherical Bessel, \\\n", + " L = 1 (red), 10\"\n", + ")\n", + "ax1.set_xlabel(\"x\")\n", + "ax1.set_ylabel(\"j(x)\")\n", + "ax1.set_xlim(left=Xmin, right=Xmax)\n", + "ax1.set_ylim(bottom=-0.2, top=0.5)\n", + "\n", + "\n", + "def down(x, n, m): # Method down, recurs downward\n", + " j = zeros((start + 2), float)\n", + " j[m + 1] = j[m] = 1.0 # Start with anything\n", + " for k in range(m, 0, -1):\n", + " j[k - 1] = ((2.0 * k + 1.0) / x) * j[k] - j[k + 1]\n", + " scale = (sin(x) / x) / j[0] # Scale solution to known j[0]\n", " return j[n] * scale\n", "\n", "\n", @@ -46,7 +49,7 @@ " ax1.plot(x, down(x, order, start), \"r.\")\n", "\n", "for x in arange(Xmin, Xmax, step):\n", - " ax1.plot(x, down(x,1,start), \"g.\")\n", + " ax1.plot(x, down(x, 1, start), \"g.\")\n", "\n", "plt.show()" ] diff --git a/content/week03_python/config_example/README.md b/content/week03_testing/config_example/README.md similarity index 100% rename from content/week03_python/config_example/README.md rename to content/week03_testing/config_example/README.md diff --git a/content/week03_python/config_example/json_reader/__init__.py b/content/week03_testing/config_example/json_reader/__init__.py similarity index 100% rename from content/week03_python/config_example/json_reader/__init__.py rename to content/week03_testing/config_example/json_reader/__init__.py diff --git a/content/week03_python/config_example/json_reader/modern_reader.py b/content/week03_testing/config_example/json_reader/modern_reader.py similarity index 100% rename from content/week03_python/config_example/json_reader/modern_reader.py rename to content/week03_testing/config_example/json_reader/modern_reader.py diff --git a/content/week03_python/config_example/pyproject.toml b/content/week03_testing/config_example/pyproject.toml similarity index 100% rename from content/week03_python/config_example/pyproject.toml rename to content/week03_testing/config_example/pyproject.toml diff --git a/content/week03_python/config_example/tests/config1.json b/content/week03_testing/config_example/tests/config1.json similarity index 100% rename from content/week03_python/config_example/tests/config1.json rename to content/week03_testing/config_example/tests/config1.json diff --git a/content/week03_python/config_example/tests/test_configuration.py b/content/week03_testing/config_example/tests/test_configuration.py similarity index 100% rename from content/week03_python/config_example/tests/test_configuration.py rename to content/week03_testing/config_example/tests/test_configuration.py diff --git a/content/week03_python/config_example/tests/test_new_configuration.py b/content/week03_testing/config_example/tests/test_new_configuration.py similarity index 100% rename from content/week03_python/config_example/tests/test_new_configuration.py rename to content/week03_testing/config_example/tests/test_new_configuration.py diff --git a/content/week03_python/debugging.md b/content/week03_testing/debugging.md similarity index 100% rename from content/week03_python/debugging.md rename to content/week03_testing/debugging.md diff --git a/content/week03_python/pytest.md b/content/week03_testing/pytest.md similarity index 100% rename from content/week03_python/pytest.md rename to content/week03_testing/pytest.md diff --git a/content/week03_python/python_setup.md b/content/week03_testing/python_setup.md similarity index 100% rename from content/week03_python/python_setup.md rename to content/week03_testing/python_setup.md diff --git a/content/week03_python/tdd.md b/content/week03_testing/tdd.md similarity index 100% rename from content/week03_python/tdd.md rename to content/week03_testing/tdd.md diff --git a/content/week03_python/testing.md b/content/week03_testing/testing.md similarity index 100% rename from content/week03_python/testing.md rename to content/week03_testing/testing.md diff --git a/content/week03_python/vector_example/README.md b/content/week03_testing/vector_example/README.md similarity index 100% rename from content/week03_python/vector_example/README.md rename to content/week03_testing/vector_example/README.md diff --git a/content/week03_python/vector_example/pyproject.toml b/content/week03_testing/vector_example/pyproject.toml similarity index 100% rename from content/week03_python/vector_example/pyproject.toml rename to content/week03_testing/vector_example/pyproject.toml diff --git a/content/week03_python/vector_example/tests/test_simple.py b/content/week03_testing/vector_example/tests/test_simple.py similarity index 100% rename from content/week03_python/vector_example/tests/test_simple.py rename to content/week03_testing/vector_example/tests/test_simple.py diff --git a/content/week03_python/vector_example/vector/__init__.py b/content/week03_testing/vector_example/vector/__init__.py similarity index 100% rename from content/week03_python/vector_example/vector/__init__.py rename to content/week03_testing/vector_example/vector/__init__.py diff --git a/content/week07_func_prog/designpatt.md b/content/week07_design/designpatt.md similarity index 100% rename from content/week07_func_prog/designpatt.md rename to content/week07_design/designpatt.md diff --git a/content/week07_func_prog/functional.md b/content/week07_design/functional.md similarity index 100% rename from content/week07_func_prog/functional.md rename to content/week07_design/functional.md diff --git a/content/week08_stat_typing/mypy_examples/optional.py b/content/week08_static_typing/mypy_examples/optional.py similarity index 100% rename from content/week08_stat_typing/mypy_examples/optional.py rename to content/week08_static_typing/mypy_examples/optional.py diff --git a/content/week08_stat_typing/mypy_examples/simple.py b/content/week08_static_typing/mypy_examples/simple.py similarity index 100% rename from content/week08_stat_typing/mypy_examples/simple.py rename to content/week08_static_typing/mypy_examples/simple.py diff --git a/content/week08_stat_typing/typing.md b/content/week08_static_typing/typing.md similarity index 100% rename from content/week08_stat_typing/typing.md rename to content/week08_static_typing/typing.md diff --git a/content/week08_stat_typing/xml_example/xml/__init__.py b/content/week08_static_typing/xml_example/xml/__init__.py similarity index 100% rename from content/week08_stat_typing/xml_example/xml/__init__.py rename to content/week08_static_typing/xml_example/xml/__init__.py