Debugging

theislab · Mar 15, 2024 · ec9e9f5 · ec9e9f5
1 parent 710baf9
commit ec9e9f5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 57 deletions.
diff --git a/docs/_notebooks/initialization-Copy1.ipynb b/docs/_notebooks/initialization-Copy1.ipynb
@@ -41,22 +41,13 @@
   {
    "cell_type": "code",
    "execution_count": 3,
-<<<<<<< Updated upstream:docs/_notebooks/initialization.ipynb
-   "id": "315ebb01-6ca5-4158-b908-1d88c702151b",
-=======
    "id": "d76eae0f-512c-40f9-919c-f4fcaad1371f",
->>>>>>> Stashed changes:docs/_notebooks/initialization-Copy1.ipynb
    "metadata": {
     "tags": []
    },
    "outputs": [],
    "source": [
-<<<<<<< Updated upstream:docs/_notebooks/initialization.ipynb
-    "# %load_ext autoreload\n",
-    "# %autoreload 2"
-=======
     "import idtrack"
->>>>>>> Stashed changes:docs/_notebooks/initialization-Copy1.ipynb
    ]
   },
   {
@@ -71,11 +62,7 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-<<<<<<< Updated upstream:docs/_notebooks/initialization.ipynb
-      "2023-06-26 15:54:02 INFO:graph_maker: The graph is being read.\n"
-=======
       "2023-11-03 13:15:20 INFO:graph_maker: The graph is being read.\n"
->>>>>>> Stashed changes:docs/_notebooks/initialization-Copy1.ipynb
      ]
     }
    ],
@@ -88,41 +75,11 @@
   },
   {
    "cell_type": "code",
-<<<<<<< Updated upstream:docs/_notebooks/initialization.ipynb
-   "execution_count": 2,
-=======
    "execution_count": null,
->>>>>>> Stashed changes:docs/_notebooks/initialization-Copy1.ipynb
    "id": "c68c650b-0098-4550-9e81-f18061293b56",
    "metadata": {
     "tags": []
    },
-<<<<<<< Updated upstream:docs/_notebooks/initialization.ipynb
-   "outputs": [
-    {
-     "ename": "ModuleNotFoundError",
-     "evalue": "No module named 'objsize'",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[0;31mModuleNotFoundError\u001b[0m                       Traceback (most recent call last)",
-      "Cell \u001b[0;32mIn[2], line 1\u001b[0m\n\u001b[0;32m----> 1\u001b[0m \u001b[38;5;28;01mimport\u001b[39;00m \u001b[38;5;21;01mobjsize\u001b[39;00m\n",
-      "\u001b[0;31mModuleNotFoundError\u001b[0m: No module named 'objsize'"
-     ]
-    }
-   ],
-   "source": []
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "id": "05b19021-5e0f-4d13-937a-43de2d866d16",
-   "metadata": {
-    "tags": []
-   },
-   "outputs": [
-    {
-=======
    "outputs": [],
    "source": []
   },
@@ -135,7 +92,6 @@
    },
    "outputs": [
     {
->>>>>>> Stashed changes:docs/_notebooks/initialization-Copy1.ipynb
      "ename": "NameError",
      "evalue": "name 'objsize' is not defined",
      "output_type": "error",
@@ -251,7 +207,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.16"
+   "version": "3.8.15"
   }
  },
  "nbformat": 4,

diff --git a/reproducibility/scripts/jupyter_tunnel.sh b/reproducibility/scripts/jupyter_tunnel.sh
@@ -32,11 +32,7 @@ fi
 source "/Users/kemalinecik/Documents/Helmholtz/password.sh"
 
 REMOTE_USER="kemal.inecik"
-<<<<<<< Updated upstream
-REMOTE_HOST="hpc-submit03gui"
-=======
 REMOTE_HOST="hpc-build01"
->>>>>>> Stashed changes
 LOCAL_PORT="10101"
 
 # Build the SSH command

diff --git a/reproducibility/scripts/sync_server.sh b/reproducibility/scripts/sync_server.sh
@@ -12,19 +12,11 @@ set -e
 source "/Users/kemalinecik/Documents/Helmholtz/password.sh"
 
 # Define constants
-<<<<<<< Updated upstream
-LOCAL_PATH="/Users/kemalinecik/Documents/Helmholtz/git.nosync"
-SERVER_PATH="/home/icb/kemal.inecik/work/codes"
-PROJECT_NAME="idtrack"
-REMOTE_USER="kemal.inecik"
-REMOTE_HOST="hpc-submit03gui"
-=======
 LOCAL_PATH="/Users/kemalinecik/git_nosync"
 SERVER_PATH="/home/icb/kemal.inecik/work/codes"
 PROJECT_NAME="idtrack"
 REMOTE_USER="kemal.inecik"
 REMOTE_HOST="hpc-build01"
->>>>>>> Stashed changes
 REMOTE_PATH="$SERVER_PATH/$PROJECT_NAME"
 
 EXCLUSIONS=("__pycache__" "*.DS_Store" ".idea" ".mypy_cache" "*.ipynb_checkpoints" ".git" "*_build")