Merge branch 'main' of https://github.com/nasa-nccs-hpda/above-shrubs…

….pytorch

requirements/Dockerfile

@@ -1,21 +1,41 @@
 # Arguments to pass to the image
-ARG VERSION_DATE=24.01
+ARG VERSION_DATE=24.09
 ARG FROM_IMAGE=nvcr.io/nvidia/pytorch
 
 # Import RAPIDS container as the BASE Image (cuda base image)
 FROM ${FROM_IMAGE}:${VERSION_DATE}-py3
 
+ENV CPLUS_INCLUDE_PATH="/usr/include/gdal"
+ENV C_INCLUDE_PATH="/usr/include/gdal"
+# ENV PROJ_LIB="/usr/share/proj"
+
+#RUN apt-get update && \
+#    apt-get -y install software-properties-common && \
+#    add-apt-repository ppa:ubuntugis/ubuntugis-unstable && \
+#    curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && \
+#    apt-get update && apt-get -y dist-upgrade && \
+#    apt-get -y install gdal-bin libgdal-dev && \
+#    apt-get -y autoremove && \
+#    rm -rf /var/cache/apt /var/lib/apt/lists/*
+
 RUN apt-get update && \
-    apt-get -y install software-properties-common && \
-    add-apt-repository ppa:ubuntugis/ubuntugis-unstable && \
-    curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && \
-    apt-get update && apt-get -y dist-upgrade && \
-    apt-get -y install gdal-bin libgdal-dev && \
-    apt-get -y autoremove && \
-    rm -rf /var/cache/apt /var/lib/apt/lists/*
+    apt-get install -y binutils libproj-dev gdal-bin libgdal-dev
+
+#RUN pip --no-cache-dir install \
+#    GDAL==`ogrinfo --version | grep -Eo '[0-9]\.[0-9]\.[0-9]+'` \
+#    rioxarray \
+#    torchgeo \
+#    transformers \
+#    datasets \
+#    webdataset \
+#    deepspeed \
+#    'huggingface_hub[cli,torch]' \
+#    timm \
+#    geopandas
 
 # Pip
-RUN pip --no-cache-dir install --ignore-installed omegaconf \
+#--ignore-installed
+RUN pip --no-cache-dir install omegaconf \
     #terratorch \
     #pytorch-lightning \
     #Lightning \
@@ -51,7 +71,6 @@ RUN pip --no-cache-dir install --ignore-installed omegaconf \
     yacs \
     termcolor \
     segmentation-models-pytorch \
-    pytorch-caney \
     GDAL==`ogrinfo --version | grep -Eo '[0-9]\.[0-9]\.[0-9]+'`