aws-bootstrap-g4dn 0.2.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

aws_bootstrap/tests/test_ssh_config.py

@@ -10,6 +10,7 @@ from aws_bootstrap.ssh import (
     _read_ssh_config,
     add_ssh_host,
     find_ssh_alias,
+    get_ssh_host_details,
     list_ssh_hosts,
     remove_ssh_host,
 )
@@ -295,3 +296,38 @@ def test_list_hosts_nonexistent_file(tmp_path):
 def test_remove_nonexistent_file(tmp_path):
     cfg = tmp_path / "no_such_file"
     assert remove_ssh_host("i-abc123", config_path=cfg) is None
+
+
+# ---------------------------------------------------------------------------
+# Port in stanza / details
+# ---------------------------------------------------------------------------
+
+
+def test_stanza_includes_port_when_non_default(tmp_path):
+    cfg = _config_path(tmp_path)
+    add_ssh_host("i-abc123", "1.2.3.4", "ubuntu", KEY_PATH, config_path=cfg, port=2222)
+    content = cfg.read_text()
+    assert "Port 2222" in content
+
+
+def test_stanza_omits_port_when_default(tmp_path):
+    cfg = _config_path(tmp_path)
+    add_ssh_host("i-abc123", "1.2.3.4", "ubuntu", KEY_PATH, config_path=cfg)
+    content = cfg.read_text()
+    assert "Port" not in content
+
+
+def test_get_ssh_host_details_parses_port(tmp_path):
+    cfg = _config_path(tmp_path)
+    add_ssh_host("i-abc123", "1.2.3.4", "ubuntu", KEY_PATH, config_path=cfg, port=2222)
+    details = get_ssh_host_details("i-abc123", config_path=cfg)
+    assert details is not None
+    assert details.port == 2222
+
+
+def test_get_ssh_host_details_default_port(tmp_path):
+    cfg = _config_path(tmp_path)
+    add_ssh_host("i-abc123", "1.2.3.4", "ubuntu", KEY_PATH, config_path=cfg)
+    details = get_ssh_host_details("i-abc123", config_path=cfg)
+    assert details is not None
+    assert details.port == 22

aws_bootstrap/tests/test_ssh_gpu.py

@@ -1,16 +1,11 @@
-"""Tests for GPU info queries via SSH (get_ssh_host_details, query_gpu_info)."""
+"""Tests for get_ssh_host_details (SSH config parsing)."""
 
 from __future__ import annotations
-import subprocess
 from pathlib import Path
-from unittest.mock import patch
 
 from aws_bootstrap.ssh import (
-    _GPU_ARCHITECTURES,
-    GpuInfo,
     add_ssh_host,
     get_ssh_host_details,
-    query_gpu_info,
 )
 
 
@@ -47,92 +42,3 @@ def test_get_ssh_host_details_nonexistent_file(tmp_path):
     """Returns None when the SSH config file doesn't exist."""
     cfg = tmp_path / "no_such_file"
     assert get_ssh_host_details("i-abc123", config_path=cfg) is None
-
-
-# ---------------------------------------------------------------------------
-# query_gpu_info
-# ---------------------------------------------------------------------------
-
-NVIDIA_SMI_OUTPUT = "560.35.03, Tesla T4, 7.5\n12.8\n12.6\n"
-
-
-@patch("aws_bootstrap.ssh.subprocess.run")
-def test_query_gpu_info_success(mock_run):
-    """Successful nvidia-smi + nvcc output returns a valid GpuInfo."""
-    mock_run.return_value = subprocess.CompletedProcess(args=[], returncode=0, stdout=NVIDIA_SMI_OUTPUT, stderr="")
-
-    info = query_gpu_info("1.2.3.4", "ubuntu", Path("/home/user/.ssh/id_ed25519"))
-    assert info is not None
-    assert isinstance(info, GpuInfo)
-    assert info.driver_version == "560.35.03"
-    assert info.cuda_driver_version == "12.8"
-    assert info.cuda_toolkit_version == "12.6"
-    assert info.gpu_name == "Tesla T4"
-    assert info.compute_capability == "7.5"
-    assert info.architecture == "Turing"
-
-
-@patch("aws_bootstrap.ssh.subprocess.run")
-def test_query_gpu_info_no_nvcc(mock_run):
-    """When nvcc is unavailable, cuda_toolkit_version is None."""
-    output = "560.35.03, Tesla T4, 7.5\n12.8\nN/A\n"
-    mock_run.return_value = subprocess.CompletedProcess(args=[], returncode=0, stdout=output, stderr="")
-
-    info = query_gpu_info("1.2.3.4", "ubuntu", Path("/home/user/.ssh/id_ed25519"))
-    assert info is not None
-    assert info.cuda_driver_version == "12.8"
-    assert info.cuda_toolkit_version is None
-
-
-@patch("aws_bootstrap.ssh.subprocess.run")
-def test_query_gpu_info_ssh_failure(mock_run):
-    """Non-zero exit code returns None."""
-    mock_run.return_value = subprocess.CompletedProcess(args=[], returncode=255, stdout="", stderr="Connection refused")
-
-    info = query_gpu_info("1.2.3.4", "ubuntu", Path("/home/user/.ssh/id_ed25519"))
-    assert info is None
-
-
-@patch("aws_bootstrap.ssh.subprocess.run", side_effect=subprocess.TimeoutExpired(cmd="ssh", timeout=15))
-def test_query_gpu_info_timeout(mock_run):
-    """TimeoutExpired returns None."""
-    info = query_gpu_info("1.2.3.4", "ubuntu", Path("/home/user/.ssh/id_ed25519"))
-    assert info is None
-
-
-@patch("aws_bootstrap.ssh.subprocess.run")
-def test_query_gpu_info_malformed_output(mock_run):
-    """Garbage output returns None."""
-    mock_run.return_value = subprocess.CompletedProcess(
-        args=[], returncode=0, stdout="not valid gpu output\n", stderr=""
-    )
-
-    info = query_gpu_info("1.2.3.4", "ubuntu", Path("/home/user/.ssh/id_ed25519"))
-    assert info is None
-
-
-# ---------------------------------------------------------------------------
-# GPU architecture mapping
-# ---------------------------------------------------------------------------
-
-
-def test_gpu_architecture_mapping():
-    """Known compute capabilities map to correct architecture names."""
-    assert _GPU_ARCHITECTURES["7.5"] == "Turing"
-    assert _GPU_ARCHITECTURES["8.0"] == "Ampere"
-    assert _GPU_ARCHITECTURES["8.6"] == "Ampere"
-    assert _GPU_ARCHITECTURES["8.9"] == "Ada Lovelace"
-    assert _GPU_ARCHITECTURES["9.0"] == "Hopper"
-    assert _GPU_ARCHITECTURES["7.0"] == "Volta"
-
-
-@patch("aws_bootstrap.ssh.subprocess.run")
-def test_query_gpu_info_unknown_architecture(mock_run):
-    """Unknown compute capability produces a fallback architecture string."""
-    mock_run.return_value = subprocess.CompletedProcess(
-        args=[], returncode=0, stdout="550.00.00, Future GPU, 10.0\n13.0\n13.0\n", stderr=""
-    )
-
-    info = query_gpu_info("1.2.3.4", "ubuntu", Path("/home/user/.ssh/id_ed25519"))
-    assert info is not None
-    assert info.architecture == "Unknown (10.0)"

{aws_bootstrap_g4dn-0.2.0.dist-info → aws_bootstrap_g4dn-0.4.0.dist-info}/METADATA

@@ -1,13 +1,16 @@
 Metadata-Version: 2.4
 Name: aws-bootstrap-g4dn
-Version: 0.2.0
+Version: 0.4.0
 Summary: Bootstrap AWS EC2 GPU instances for hybrid local-remote development
 Author: Adam Ever-Hadani
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/promptromp/aws-bootstrap-g4dn
 Project-URL: Issues, https://github.com/promptromp/aws-bootstrap-g4dn/issues
 Keywords: aws,ec2,gpu,cuda,deep-learning,spot-instances,cli
-Requires-Python: >=3.14
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: boto3>=1.35
@@ -46,7 +49,7 @@ ssh aws-gpu1                  # You're in, venv activated, PyTorch works
 ### 🎯 Target Workflows
 
 1. **Jupyter server-client** — Jupyter runs on the instance, connect from your local browser
-2. **VSCode Remote SSH** — `ssh aws-gpu1` just works with the Remote SSH extension
+2. **VSCode Remote SSH** — opens `~/workspace` with pre-configured CUDA debug/build tasks and an example `.cu` file
 3. **NVIDIA Nsight remote debugging** — GPU debugging over SSH
 
 ---
@@ -55,7 +58,7 @@ ssh aws-gpu1                  # You're in, venv activated, PyTorch works
 
 1. AWS profile configured with relevant permissions (profile name can be passed via `--profile` or read from `AWS_PROFILE` env var)
 2. AWS CLI v2 — see [here](https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html)
-3. Python 3.14+ and [uv](https://github.com/astral-sh/uv)
+3. Python 3.12+ and [uv](https://github.com/astral-sh/uv)
 4. An SSH key pair (see below)
 
 ## Installation
@@ -123,6 +126,12 @@ aws-bootstrap launch --on-demand --instance-type g5.xlarge --region us-east-1
 # Launch without running the remote setup script
 aws-bootstrap launch --no-setup
 
+# Use a specific Python version in the remote venv
+aws-bootstrap launch --python-version 3.13
+
+# Use a non-default SSH port
+aws-bootstrap launch --ssh-port 2222
+
 # Use a specific AWS profile
 aws-bootstrap launch --profile my-aws-profile
 ```
@@ -146,13 +155,14 @@ The setup script runs automatically on the instance after SSH becomes available:
 |------|------|
 | **GPU verify** | Confirms `nvidia-smi` and `nvcc` are working |
 | **Utilities** | Installs `htop`, `tmux`, `tree`, `jq` |
-| **Python venv** | Creates `~/venv` with `uv`, auto-activates in `~/.bashrc` |
+| **Python venv** | Creates `~/venv` with `uv`, auto-activates in `~/.bashrc`. Use `--python-version` to pin a specific Python (e.g. `3.13`) |
 | **CUDA-aware PyTorch** | Detects CUDA toolkit version → installs PyTorch from the matching `cu{TAG}` wheel index |
 | **CUDA smoke test** | Runs `torch.cuda.is_available()` + GPU matmul to verify the stack |
 | **GPU benchmark** | Copies `gpu_benchmark.py` to `~/gpu_benchmark.py` |
 | **GPU smoke test notebook** | Copies `gpu_smoke_test.ipynb` to `~/gpu_smoke_test.ipynb` (open in JupyterLab) |
 | **Jupyter** | Configures and starts JupyterLab as a systemd service on port 8888 |
 | **SSH keepalive** | Configures server-side keepalive to prevent idle disconnects |
+| **VSCode workspace** | Creates `~/workspace/.vscode/` with `launch.json` and `tasks.json` (auto-detected `cuda-gdb` path and GPU arch), plus an example `saxpy.cu` |
 
 ### 📊 GPU Benchmark
 
@@ -191,6 +201,28 @@ ssh -i ~/.ssh/id_ed25519 -NL 8888:localhost:8888 ubuntu@<public-ip>
 
 A **GPU smoke test notebook** (`~/gpu_smoke_test.ipynb`) is pre-installed on every instance. Open it in JupyterLab to interactively verify the CUDA stack, run FP32/FP16 matmuls, train a small CNN on MNIST, and visualise training loss and GPU memory usage.
 
+### 🖥️ VSCode Remote SSH
+
+The remote setup creates a `~/workspace` folder with pre-configured CUDA debug and build tasks:
+
+```
+~/workspace/
+├── .vscode/
+│   ├── launch.json   # CUDA debug configs (cuda-gdb path auto-detected)
+│   └── tasks.json    # nvcc build tasks (GPU arch auto-detected, e.g. sm_75)
+└── saxpy.cu          # Example CUDA source — open and press F5 to debug
+```
+
+Connect directly from your terminal:
+
+```bash
+code --folder-uri vscode-remote://ssh-remote+aws-gpu1/home/ubuntu/workspace
+```
+
+Then install the [Nsight VSCE extension](https://marketplace.visualstudio.com/items?itemName=NVIDIA.nsight-vscode-edition) on the remote when prompted. Open `saxpy.cu`, set a breakpoint, and press F5.
+
+See [Nsight remote profiling guide](docs/nsight-remote-profiling.md) for more details on CUDA debugging and profiling workflows.
+
 ### 📋 Listing Resources
 
 ```bash
@@ -220,6 +252,9 @@ aws-bootstrap status
 # Include GPU info (CUDA toolkit + driver version, GPU name, architecture) via SSH
 aws-bootstrap status --gpu
 
+# Hide connection commands (shown by default for each running instance)
+aws-bootstrap status --no-instructions
+
 # List instances in a specific region
 aws-bootstrap status --region us-east-1
 
@@ -310,7 +345,7 @@ aws-bootstrap launch --instance-type t3.medium --ami-filter "ubuntu/images/hvm-s
 | GPU instance pricing | [instances.vantage.sh](https://instances.vantage.sh/aws/ec2/g4dn.xlarge) |
 | Spot instance quotas | [AWS docs](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-spot-limits.html) |
 | Deep Learning AMIs | [AWS docs](https://docs.aws.amazon.com/dlami/latest/devguide/what-is-dlami.html) |
-| Nvidia Nsight remote debugging | [Nvidia docs](https://docs.nvidia.com/nsight-visual-studio-edition/3.2/Content/Setup_Remote_Debugging.htm) |
+| Nsight remote GPU profiling | [Guide](docs/nsight-remote-profiling.md) — Nsight Compute, Nsight Systems, and Nsight VSCE on EC2 |
 
 Tutorials on setting up a CUDA environment on EC2 GPU instances:
 

aws_bootstrap_g4dn-0.4.0.dist-info/RECORD

@@ -0,0 +1,27 @@
+aws_bootstrap/__init__.py,sha256=kl_jvrunGyIyizdRqAP6ROb5P1BBrXX5PTq5gq1ipU0,82
+aws_bootstrap/cli.py,sha256=XqCKxyc294krVtggrsqm2cYrHR6DWaqQeuzrRAN5u_c,20501
+aws_bootstrap/config.py,sha256=TeCOYDlijT-KD5SFIzc-VvBhOqcq9YCgen9NK63rka8,895
+aws_bootstrap/ec2.py,sha256=LHpzW91ayK45gsWV_B4LanSZIhWggqTsL31qHUceiaA,12274
+aws_bootstrap/gpu.py,sha256=WTnHR0s3mQHDlnzqRgqAC6omWz7nT5YtGpcs0Bf88jk,692
+aws_bootstrap/ssh.py,sha256=UFRDgNR8cljV-lwMvCy_BAJQBz7gj4a_cQIulf-2A10,19226
+aws_bootstrap/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aws_bootstrap/resources/gpu_benchmark.py,sha256=1eFt_3MXvoLhs9HahrRPhbxvtdjFaXG2Ty3GEg7Gud0,29366
+aws_bootstrap/resources/gpu_smoke_test.ipynb,sha256=XvAOEIPa5H9ri5mRZqOdknmwOwKNvCME6DzBGuhRYfg,10698
+aws_bootstrap/resources/launch.json,sha256=ZOcvHLy3-zBOqRTtFzuyn-_2tB64yuEn8PrJOoZ-PgE,1484
+aws_bootstrap/resources/remote_setup.sh,sha256=z_YGdzwEHWInkE3dZVbBNa0F_joTeVhnOpCYOj1CK30,8331
+aws_bootstrap/resources/requirements.txt,sha256=gpYl1MFCfWXiAhbIUgAjuTHONz3MKci25msIyOkMmUk,75
+aws_bootstrap/resources/saxpy.cu,sha256=1BSESEwGGCx3KWx9ZJ8jiPHQ42KzQN6i2aP0I28bPsA,1178
+aws_bootstrap/resources/tasks.json,sha256=6U8pB1N8YIWgUCfFet4ne3nYnI92tWv5D5kPiQG3Zlg,1576
+aws_bootstrap/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aws_bootstrap/tests/test_cli.py,sha256=Lwzpdovq_iJFB6qZ8NuySqzHFkQ_2Q8AAGXdITXi1Vo,32564
+aws_bootstrap/tests/test_config.py,sha256=arvET6KNl4Vqsz0zFrSdhciXGU688bfsvCr3dSpziN0,1050
+aws_bootstrap/tests/test_ec2.py,sha256=Jmqsjv973hxXbZWfGgECtm6aa2156Lzji227sYMBuMg,10547
+aws_bootstrap/tests/test_gpu.py,sha256=rbMuda_sIVbaCzkWXoLv9YIfnWztgRoP7NuVL8XHrUY,3871
+aws_bootstrap/tests/test_ssh_config.py,sha256=iQDd3hJ8to-2-QHW26Brtglfl0q0P6sCE6U_itxoNyY,11609
+aws_bootstrap/tests/test_ssh_gpu.py,sha256=dRp86Og-8GqiATSff3rxhu83mBZdGgqI4UOnoC00Ln0,1454
+aws_bootstrap_g4dn-0.4.0.dist-info/licenses/LICENSE,sha256=Hen77Mt8sazSQJ9DgrmZuAvDwo2vc5JAkR_avuFV-CM,1067
+aws_bootstrap_g4dn-0.4.0.dist-info/METADATA,sha256=0OQsG5kVwsbfT7dfaZoNrkOlfNRUrKr9NwljtLBKj1I,13483
+aws_bootstrap_g4dn-0.4.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+aws_bootstrap_g4dn-0.4.0.dist-info/entry_points.txt,sha256=T8FXfOgmLEvFi8DHaFJ3tCzId9J3_d2Y6qT98OXxCjA,57
+aws_bootstrap_g4dn-0.4.0.dist-info/top_level.txt,sha256=mix9gZRs8JUv0OMSB_rwdGcRnTKzsKgHrE5fyAn5zJw,14
+aws_bootstrap_g4dn-0.4.0.dist-info/RECORD,,

aws_bootstrap_g4dn-0.2.0.dist-info/RECORD

@@ -1,22 +0,0 @@
-aws_bootstrap/__init__.py,sha256=kl_jvrunGyIyizdRqAP6ROb5P1BBrXX5PTq5gq1ipU0,82
-aws_bootstrap/cli.py,sha256=3PWGU4djqCvABNpLvYTk473Nmmmrad3JQ3iQtg5YmnE,17917
-aws_bootstrap/config.py,sha256=bOADtpujEacED0pu9m7D781UFlMhZrmtHQ7eqI6ySjk,834
-aws_bootstrap/ec2.py,sha256=-yEyGMCycY4ccsmbgqHnLK2FRFWX2kr7nLfYWXSKeaY,12242
-aws_bootstrap/ssh.py,sha256=-8F0PAkl7CCY1b9n46ZhWJ6faIMlSvA26BleeIp-rMA,17533
-aws_bootstrap/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aws_bootstrap/resources/gpu_benchmark.py,sha256=2uoss2bZGhg7c3D7Hg1-EJlOVDtzAH4co1ahSvF_lVU,29080
-aws_bootstrap/resources/gpu_smoke_test.ipynb,sha256=XvAOEIPa5H9ri5mRZqOdknmwOwKNvCME6DzBGuhRYfg,10698
-aws_bootstrap/resources/remote_setup.sh,sha256=FzpXEw-LvlXROi-PmO72yEyDWWi-3Tul6D7-vFDubXQ,5460
-aws_bootstrap/resources/requirements.txt,sha256=gpYl1MFCfWXiAhbIUgAjuTHONz3MKci25msIyOkMmUk,75
-aws_bootstrap/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aws_bootstrap/tests/test_cli.py,sha256=xGCC07aPZMc5pExo__qz7X1Tm2v9Z1Xn4K99JocESas,23627
-aws_bootstrap/tests/test_config.py,sha256=arvET6KNl4Vqsz0zFrSdhciXGU688bfsvCr3dSpziN0,1050
-aws_bootstrap/tests/test_ec2.py,sha256=Jmqsjv973hxXbZWfGgECtm6aa2156Lzji227sYMBuMg,10547
-aws_bootstrap/tests/test_ssh_config.py,sha256=Rt3e7B22d8kK0PzFgXB4gwpF4HvIseiqzcpouCwMo5M,10333
-aws_bootstrap/tests/test_ssh_gpu.py,sha256=W6GQzILCy_qPrvWQlCC8Ris-vuTzTGiyNXEyMzwD1kM,5154
-aws_bootstrap_g4dn-0.2.0.dist-info/licenses/LICENSE,sha256=Hen77Mt8sazSQJ9DgrmZuAvDwo2vc5JAkR_avuFV-CM,1067
-aws_bootstrap_g4dn-0.2.0.dist-info/METADATA,sha256=XqtBIr0EdnRvsy83usvZ5n-B9WNpfLCGoVaVR9_1eaI,11927
-aws_bootstrap_g4dn-0.2.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-aws_bootstrap_g4dn-0.2.0.dist-info/entry_points.txt,sha256=T8FXfOgmLEvFi8DHaFJ3tCzId9J3_d2Y6qT98OXxCjA,57
-aws_bootstrap_g4dn-0.2.0.dist-info/top_level.txt,sha256=mix9gZRs8JUv0OMSB_rwdGcRnTKzsKgHrE5fyAn5zJw,14
-aws_bootstrap_g4dn-0.2.0.dist-info/RECORD,,