Merge branch 'ultralytics:master' into master

ultralytics · May 12, 2023 · 587a186 · 587a186
2 parents e37b631 + e382d4c
commit 587a186
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/links.yml b/.github/workflows/links.yml
@@ -32,7 +32,7 @@ jobs:
           timeout_minutes: 5
           retry_wait_seconds: 60
           max_attempts: 3
-          command: lychee --accept 429,999 --exclude-loopback --exclude twitter.com --exclude-path '**/ci.yaml' --exclude-mail --github-token ${{ secrets.GITHUB_TOKEN }} './**/*.md' './**/*.html'
+          command: lychee --accept 301,302,429,999 --exclude-loopback --exclude twitter.com --exclude-path '**/ci.yaml' --exclude-mail --github-token ${{ secrets.GITHUB_TOKEN }} './**/*.md' './**/*.html'
 
       - name: Test Markdown, HTML, YAML, Python and Notebook links with retry
         if: github.event_name == 'workflow_dispatch'
@@ -41,4 +41,4 @@ jobs:
           timeout_minutes: 5
           retry_wait_seconds: 60
           max_attempts: 3
-          command: lychee --accept 429,999 --exclude-loopback --exclude twitter.com,url.com --exclude-path '**/ci.yaml' --exclude-mail --github-token ${{ secrets.GITHUB_TOKEN }} './**/*.md' './**/*.html' './**/*.yml' './**/*.yaml' './**/*.py' './**/*.ipynb'
+          command: lychee --accept 301,302,429,999 --exclude-loopback --exclude twitter.com,url.com --exclude-path '**/ci.yaml' --exclude-mail --github-token ${{ secrets.GITHUB_TOKEN }} './**/*.md' './**/*.html' './**/*.yml' './**/*.yaml' './**/*.py' './**/*.ipynb'
diff --git a/classify/tutorial.ipynb b/classify/tutorial.ipynb
@@ -1255,16 +1255,17 @@
       "outputs": [],
       "source": [
         "#@title Select YOLOv5 🚀 logger {run: 'auto'}\n",
-        "logger = 'TensorBoard' #@param ['TensorBoard', 'Comet', 'ClearML']\n",
+        "logger = 'Comet' #@param ['Comet', 'ClearML', 'TensorBoard']\n",
         "\n",
-        "if logger == 'TensorBoard':\n",
-        "  %load_ext tensorboard\n",
-        "  %tensorboard --logdir runs/train\n",
-        "elif logger == 'Comet':\n",
+        "if logger == 'Comet':\n",
         "  %pip install -q comet_ml\n",
         "  import comet_ml; comet_ml.init()\n",
         "elif logger == 'ClearML':\n",
-        "  import clearml; clearml.browser_login()"
+        "  %pip install -q clearml\n",
+        "  import clearml; clearml.browser_login()\n",
+        "elif logger == 'TensorBoard':\n",
+        "  %load_ext tensorboard\n",
+        "  %tensorboard --logdir runs/train"
       ]
     },
     {

diff --git a/segment/tutorial.ipynb b/segment/tutorial.ipynb
@@ -250,16 +250,17 @@
       "outputs": [],
       "source": [
         "#@title Select YOLOv5 🚀 logger {run: 'auto'}\n",
-        "logger = 'TensorBoard' #@param ['TensorBoard', 'Comet', 'ClearML']\n",
+        "logger = 'Comet' #@param ['Comet', 'ClearML', 'TensorBoard']\n",
         "\n",
-        "if logger == 'TensorBoard':\n",
-        "  %load_ext tensorboard\n",
-        "  %tensorboard --logdir runs/train-seg\n",
-        "elif logger == 'Comet':\n",
+        "if logger == 'Comet':\n",
         "  %pip install -q comet_ml\n",
         "  import comet_ml; comet_ml.init()\n",
         "elif logger == 'ClearML':\n",
-        "  import clearml; clearml.browser_login()"
+        "  %pip install -q clearml\n",
+        "  import clearml; clearml.browser_login()\n",
+        "elif logger == 'TensorBoard':\n",
+        "  %load_ext tensorboard\n",
+        "  %tensorboard --logdir runs/train"
       ]
     },
     {

diff --git a/utils/general.py b/utils/general.py
@@ -388,7 +388,7 @@ def check_version(current='0.0.0', minimum='0.0.0', name='version ', pinned=Fals
 
 
 @TryExcept()
-def check_requirements(requirements=ROOT.parent / 'requirements.txt', exclude=(), install=True, cmds=''):
+def check_requirements(requirements=ROOT / 'requirements.txt', exclude=(), install=True, cmds=''):
     """
     Check if installed dependencies meet YOLOv5 requirements and attempt to auto-update if needed.