fixed gamma again, tweak makefiles

Author: bmild

.gitignore

@@ -0,0 +1,2 @@
+*.ipynb_checkpoints*
+*.pyc

README.md

@@ -222,9 +222,9 @@ General usage (in `opengl_viewer/` directory) is
 
 - __`PyramidCU::GenerateFeatureList: an illegal memory access was encountered`__:
 Some machine configurations might run into problems running the script `imgs2poses.py`.
-A solution to that would be to set the environment variable `CUDA_VISIBLE_DEVICES`.
+A solution to that would be to set the environment variable `CUDA_VISIBLE_DEVICES`. If the issue persists, try uncommenting [this line](https://github.com/Fyusion/LLFF/blob/master/llff/poses/colmap_wrapper.py#L33) to stop COLMAP from using the GPU to extract image features.
 - __Black screen__:
-In the latest versions of MacOS, OpenGL initializes a context with a black screen until one drag or resize the window. If you run into this probblem, please drag the window to another position.
+In the latest versions of MacOS, OpenGL initializes a context with a black screen until the window is dragged or resized. If you run into this probblem, please drag the window to another position.
 
 
 ## Citation

cuda_renderer/Makefile

@@ -1,4 +1,4 @@
-all: main.cu mpi_cuda.cu
+cuda_renderer: main.cu mpi_cuda.cu
 	nvcc -ccbin g++ -std=c++11 -m64 -I. \
 	main.cu mpi_cuda.cu -o cuda_renderer 
 

llff/poses/colmap_wrapper.py

@@ -30,6 +30,7 @@ def run_colmap(basedir):
             '--database_path', os.path.join(basedir, 'database.db'), 
             '--image_path', os.path.join(basedir, 'images'),
             '--ImageReader.single_camera', '1',
+            # '--SiftExtraction.use_gpu', '0',
     ]
     feat_output = ( subprocess.check_output(feature_extractor_args, universal_newlines=True) )
     logfile.write(feat_output)

llff/poses/pose_utils.py

@@ -236,7 +236,14 @@ def load_data(basedir, factor=None, width=None, height=None, load_imgs=True):
     if not load_imgs:
         return poses, bds
 
-    imgs = [imageio.imread(f, ignoregamma=True)[...,:3]/255. for f in imgfiles]
+    # imgs = [imageio.imread(f, ignoregamma=True)[...,:3]/255. for f in imgfiles]
+    def imread(f):
+        if f.endswith('png'):
+            return imageio.imread(f, ignoregamma=True)
+        else:
+            return imageio.imread(f)
+        
+    imgs = imgs = [imread(f)[...,:3]/255. for f in imgfiles]
     imgs = np.stack(imgs, -1)  
 
     print('Loaded image data', imgs.shape, poses[:,-1,0])

opengl_viewer/Makefile

@@ -7,7 +7,7 @@ ifeq ($(UNAME), Darwin)
 	FLAGS = -framework OpenGl -framework Cocoa -framework IOKit -framework CoreVideo -lglfw3 
 endif
 
-all: glad.c viewer.cpp
+opengl_viewer: glad.c viewer.cpp
 	g++ glad.c viewer.cpp -o opengl_viewer -I. -std=c++11 $(FLAGS)
 
 clean:

scenedir2mpis.sh

@@ -1,5 +1,5 @@
 mkdir -p $1/outputs
 python imgs2poses.py $1
 python imgs2mpis.py $1 $1/mpis_$2 --height $2
-python imgs2renderpath.py $1 $1/outputs/test_path.txt 
+python imgs2renderpath.py $1 $1/outputs/test_path.txt
 cuda_renderer/cuda_renderer $1/mpis_$2 $1/outputs/test_path.txt $1/outputs/test_vid.mp4 -1 .8 18

vid2mpis.sh

@@ -0,0 +1,14 @@
+### Automatically extracts a frame every half second to use for creating MPIs
+
+# export CUDA_VISIBLE_DEVICES=0
+mkdir -p $2
+mkdir -p $2/images
+mkdir -p $2/outputs
+# unzip -j $1 -d $2/images
+ffmpeg -i $1 -vf fps=2 $2/images/img%03d.png
+python imgs2poses.py $2
+python imgs2mpis.py $2 $2/mpis_$3 --height $3
+python imgs2renderpath.py $2 $2/outputs/test_path.txt --spiral
+cd cuda_renderer && make && cd ..
+cuda_renderer/cuda_renderer $2/mpis_$3 $2/outputs/test_path.txt $2/outputs/test_vid.mp4 -1 .8 18
+# python mpis2video.py $2/mpis_$3 $2/outputs/test_path.npy $2/outputs/test_vid.mp4 --crop_factor .8