rename datasets directory to avoid import conflict

vcg-uvic · Dec 19, 2018 · 53c579c · 53c579c
1 parent 55cbb44
commit 53c579c
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 148 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,7 @@
 *.npy
 *.pyc
 *~
-.ipynb_checkpoints/
+.ipynb_checkpoints/
+dump_feats/
+logs/
+release/
diff --git a/datasets/__init__.py → mydatasets/__init__.py b/datasets/__init__.py → mydatasets/__init__.py
diff --git a/datasets/dataset_tools.py → mydatasets/dataset_tools.py b/datasets/dataset_tools.py → mydatasets/dataset_tools.py
diff --git a/datasets/se3dataset.py → mydatasets/se3dataset.py b/datasets/se3dataset.py → mydatasets/se3dataset.py
diff --git a/datasets/sfmdataset.py → mydatasets/sfmdataset.py b/datasets/sfmdataset.py → mydatasets/sfmdataset.py
diff --git a/notebooks/demo.ipynb b/notebooks/demo.ipynb
diff --git a/notebooks/example.ipynb b/notebooks/example.ipynb
@@ -37,16 +37,14 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "LOCAL_PATH = '../'\n",
     "if LOCAL_PATH not in sys.path:\n",
     "    sys.path.append(LOCAL_PATH)\n",
     "from common.tf_layer_utils import *\n",
-    "from datasets import *\n",
+    "from mydatasets import *\n",
     "from det_tools import *\n",
     "MODEL_PATH = '../models/'\n",
     "if MODEL_PATH not in sys.path:\n",
@@ -76,9 +74,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "yfcc_dir = '../release/outdoor_examples/'\n",
@@ -113,9 +109,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "photos1, photos2, depths1, depths2, valid_masks1, valid_masks2, c2Tc1s, c1Tc2s, c1Tws, c2Tws, Ks1, Ks2, thetas1, thetas2, inv_thetas1, inv_thetas2, theta_params = next_batch\n",
@@ -145,9 +139,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "tfconfig = tf.ConfigProto()\n",
@@ -159,9 +151,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "fetch_dict = {\n",
@@ -235,9 +225,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "scannet_dir = '/cvlabdata1/home/ono/datasets/scannet/dataset/all/valid' # set your own path\n",
@@ -283,9 +271,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "photos1, photos2, depths1, depths2, valid_masks1, valid_masks2, c2Tc1s, c1Tc2s, c1Tws, c2Tws, Ks1, Ks2, thetas1, thetas2, inv_thetas1, inv_thetas2, theta_params = next_batch\n",
@@ -315,9 +301,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "tfconfig = tf.ConfigProto()\n",
@@ -329,9 +313,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "fetch_dict = {\n",
@@ -362,9 +344,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": []
   }
@@ -385,7 +365,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.1"
+   "version": "3.6.5"
   }
  },
  "nbformat": 4,

diff --git a/run_lfnet.py b/run_lfnet.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 from __future__ import print_function
 import os
 import sys
@@ -9,7 +10,7 @@
 from tqdm import tqdm
 import pickle
 
-from datasets import *
+from mydatasets import *
 
 from det_tools import *
 from eval_tools import draw_keypoints

diff --git a/train_lfnet.py b/train_lfnet.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 # Self Supervised Joint Training for Keypoints Detector & Descriptor
 
 from __future__ import print_function
@@ -15,7 +17,7 @@
 if LOCAL_PATH not in sys.path:
     sys.path.append(LOCAL_PATH)
 
-from datasets import *
+from mydatasets import *
 # from datasets.scenenet import SceneNetPairwiseDataset
 # from datasets.se3dataset import SE3PairwiseDataset
 
@@ -1199,4 +1201,4 @@ def overwrite_config(config):
         config.aug_max_degree = 45
         print('Kill rot_aug because aug_max_degree=0')
 
-    main(config)
+    main(config)