Change logging

scotts · scotts · commit 571ed17eaa00 · 2024-10-23T06:50:33.000-07:00
diff --git a/.github/workflows/linux_wheel.yaml b/.github/workflows/linux_wheel.yaml
@@ -1,4 +1,4 @@
-name: Build and test Linux wheels
+name: Build and test Linux wheel
 
 on:
   pull_request:
@@ -24,6 +24,7 @@ defaults:
     shell: bash -l -eo pipefail {0}
 
 jobs:
+
   generate-matrix:
     uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
     with:
@@ -34,6 +35,8 @@ jobs:
       with-xpu: disable
       with-rocm: disable
       with-cuda: disable
+      build-python-only: "disable"
+
   build:
     needs: generate-matrix
     strategy:
@@ -60,7 +63,6 @@ jobs:
       matrix:
         python-version: ['3.9']
         ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '6.1.1', '7.0.1']
-    if: ${{ always() }}
     needs: build
     steps:
       - uses: actions/download-artifact@v3
@@ -121,7 +123,7 @@ jobs:
           ls
       - name: Smoke test
         run: |
-          python test/decoders/manual_smoke_test.py
+          python -X faulthandler test/decoders/manual_smoke_test.py
       - name: Run Python tests
         run: |
           pytest test -vvv
diff --git a/.github/workflows/macos_wheel.yaml b/.github/workflows/macos_wheel.yaml
@@ -1,4 +1,4 @@
-name: Build and test MacOS wheels
+name: Build and test MacOS wheel
 
 on:
   pull_request:
@@ -24,6 +24,7 @@ defaults:
     shell: bash -l -eo pipefail {0}
 
 jobs:
+
   generate-matrix:
     uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@macbuildwheel
     with:
@@ -34,6 +35,8 @@ jobs:
       with-xpu: disable
       with-rocm: disable
       with-cuda: disable
+      build-python-only: "disable"
+
   build:
     needs: generate-matrix
     strategy:
@@ -61,134 +64,47 @@ jobs:
       matrix:
         python-version: ['3.9']
         ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '6.1.1', '7.0.1']
-    if: ${{ always() }}
     needs: build
     steps:
-      - name: Setup miniconda
-        uses: pytorch/test-infra/.github/actions/setup-miniconda@macbuildwheel
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Check out torchcodec repo
-        uses: actions/checkout@v3
-      - name: Check out tet-infra repo
-        uses: actions/checkout@v3
-        with:
-          repository: pytorch/test-infra
-          ref: macbuildwheel
-          path: test-infra
       - name: Download wheel
         uses: actions/download-artifact@v3
         with:
           name: pytorch_torchcodec__${{ matrix.python-version }}_cpu_
           path: pytorch/torchcodec/dist/
-
-## start copying from test-infra/.github/actions/setup-binary-builds/action.yaml
-      - name: Clean conda environment
-        shell: bash -l {0}
-        run: |
-          set -euxo pipefail
-          conda info | grep -i 'base environment'
-          conda clean --all --quiet --yes
-      - name: Reset channel priority
-        shell: bash -l {0}
-        run: |
-          set -euxo pipefail
-          conda config --set channel_priority false
-      - name: Discover dir structure
-        shell: bash -l {0}
-        run: |
-          echo "pwd"
-          pwd
-          echo "ls -lh"
-          ls -lh
-          echo "ls -lh pytorch/torchcodec"
-          ls -lh pytorch/torchcodec
-          echo "ls -lh pytorch/torchcodec/dist"
-          ls -lh pytorch/torchcodec/dist
-          wheel_path=`find pytorch/torchcodec/dist -type f -name "*.whl"`
-          echo "unzip $wheel_path -d unzipped_wheel"
-          unzip $wheel_path -d unzipped_wheel
-          echo "ls -lh unzipped_wheel"
-          ls -lh unzipped_wheel
-      - name: Generate file from pytorch_pkg_helpers
-        # below does not seem necessary in our context
-        #working-directory: "pytorch/torchcodec"
-        shell: bash -l {0}
-        run: |
-          set -euxo pipefail
-          CONDA_ENV="${RUNNER_TEMP}/pytorch_pkg_helpers_${GITHUB_RUN_ID}"
-          conda create \
-            --yes --quiet \
-            --prefix "${CONDA_ENV}" \
-            "python=3.9"
-          CONDA_ENV="${CONDA_ENV}"
-          CONDA_RUN="conda run -p ${CONDA_ENV}"
-          ${CONDA_RUN} python -m pip install ${GITHUB_WORKSPACE}/test-infra/tools/pkg-helpers
-          BUILD_ENV_FILE="${RUNNER_TEMP}/build_env_${GITHUB_RUN_ID}"
-          ${CONDA_RUN} python -m pytorch_pkg_helpers > "${BUILD_ENV_FILE}"
-          cat "${BUILD_ENV_FILE}"
-          echo "BUILD_ENV_FILE=${BUILD_ENV_FILE}" >> "${GITHUB_ENV}"
-      - name: Setup conda environment for build
-        shell: bash -l {0}
-        env:
-          PYTHON_VERSION: ${{ matrix.python-version }}
-        run: |
-          set -euxo pipefail
-          CONDA_ENV="${RUNNER_TEMP}/conda_environment_${GITHUB_RUN_ID}"
-          if [[ "${PACKAGE_TYPE:-}" == "conda" ]]; then
-            # For conda package host python version is irrelevant
-            export PYTHON_VERSION=3.9
-            export CONDA_BUILD_EXTRA="conda=24.4.0 conda-build=24.3.0 python-libarchive-c=2.9"
-          else
-            # For wheel builds we don't need neither conda nor conda-build
-            export CONDA_BUILD_EXTRA=""
-          fi
-
-          conda create \
-            --yes --quiet \
-            --prefix "${CONDA_ENV}" \
-            "python=${PYTHON_VERSION}" \
-            cmake=3.26 \
-            ninja=1.10 \
-            pkg-config=0.29 \
-            ${CONDA_BUILD_EXTRA} \
-            wheel=0.37
-
-          echo "CONDA_ENV=${CONDA_ENV}" >> "${GITHUB_ENV}"
-          echo "CONDA_RUN=conda run -p ${CONDA_ENV}" >> "${GITHUB_ENV}"
-## end copying
-      - name: Run otool
-        shell: bash -l {0}
-        run: |
-          echo "otool -L unzipped_wheel/torchcodec/libtorchcodec*"
-          otool -L unzipped_wheel/torchcodec/libtorchcodec*
-
+      - name: Setup conda env
+        uses: conda-incubator/setup-miniconda@v3
+        with:
+          auto-update-conda: true
+          miniconda-version: "latest"
+          activate-environment: test
+          python-version: ${{ matrix.python-version }}
       - name: Update pip
         run: python -m pip install --upgrade pip
-      - name: Install ffmpeg
-        run: |
-          ${CONDA_RUN} conda install "ffmpeg=${{ matrix.ffmpeg-version-for-tests }}" -c conda-forge
-          ${CONDA_RUN} ffmpeg -version
       - name: Install PyTorch
         run: |
-          ${CONDA_RUN} python -m pip install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu
+          python -m pip install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu
       - name: Install torchcodec from the wheel
         run: |
           wheel_path=`find pytorch/torchcodec/dist -type f -name "*.whl"`
           echo Installing $wheel_path
-          ${CONDA_RUN} python -m pip install $wheel_path -vvv
+          python -m pip install $wheel_path -vvv
+      - name: Check out torchcodec repo
+        uses: actions/checkout@v3
+      - name: Install ffmpeg
+        run: |
+          conda install "ffmpeg=${{ matrix.ffmpeg-version-for-tests }}" -c conda-forge
+          ffmpeg -version
       - name: Install test dependencies
         run: |
-          ${CONDA_RUN} python -m pip install --pre torchvision --index-url https://download.pytorch.org/whl/nightly/cpu
-          ${CONDA_RUN} python -m pip install numpy pytest pillow
+          python -m pip install --pre torchvision --index-url https://download.pytorch.org/whl/nightly/cpu
+          python -m pip install numpy pytest pillow
       - name: Delete the src/ folder just for fun
         run: |
           rm -r src/
-          ls
+          ls -lh
       - name: Smoke test
         run: |
-          ${CONDA_RUN} python -X faulthandler test/decoders/manual_smoke_test.py
-          ls -lh
+          python -X faulthandler test/decoders/manual_smoke_test.py
       - name: Run Python tests
         run: |
-          ${CONDA_RUN} pytest test
+          pytest test -vvv
diff --git a/src/torchcodec/decoders/_core/VideoDecoder.cpp b/src/torchcodec/decoders/_core/VideoDecoder.cpp
@@ -657,7 +657,6 @@ bool VideoDecoder::canWeAvoidSeekingForStream(
 // AVFormatContext if it is needed. We can skip seeking in certain cases. See
 // the comment of canWeAvoidSeeking() for details.
 void VideoDecoder::maybeSeekToBeforeDesiredPts() {
-  std::cerr << "maybeSeekToBeforeDesiredPts" << std::endl;
   if (activeStreamIndices_.size() == 0) {
     return;
   }
@@ -677,9 +676,6 @@ void VideoDecoder::maybeSeekToBeforeDesiredPts() {
     int64_t desiredPtsForStream = *maybeDesiredPts_ * streamInfo.timeBase.den;
     if (!canWeAvoidSeekingForStream(
             streamInfo, streamInfo.currentPts, desiredPtsForStream)) {
-      VLOG(5) << "Seeking is needed for streamIndex=" << streamIndex
-              << " desiredPts=" << desiredPtsForStream
-              << " currentPts=" << streamInfo.currentPts;
       mustSeek = true;
       break;
     }
@@ -724,20 +720,14 @@ void VideoDecoder::maybeSeekToBeforeDesiredPts() {
 
 VideoDecoder::RawDecodedOutput VideoDecoder::getDecodedOutputWithFilter(
     std::function<bool(int, AVFrame*)> filterFunction) {
-  std::cerr << "getDecodedOutputWithFilter" << std::endl;
   auto start = std::chrono::high_resolution_clock::now();
   if (activeStreamIndices_.size() == 0) {
     throw std::runtime_error("No active streams configured.");
   }
-  VLOG(9) << "Starting getDecodedOutputWithFilter()";
   resetDecodeStats();
   if (maybeDesiredPts_.has_value()) {
-    std::cerr << "\thas value" << std::endl;
-    VLOG(9) << "maybeDesiredPts_=" << *maybeDesiredPts_;
-    std::cerr << "\tlogged pts" << std::endl;
     maybeSeekToBeforeDesiredPts();
     maybeDesiredPts_ = std::nullopt;
-    VLOG(9) << "seeking done";
   }
   auto seekDone = std::chrono::high_resolution_clock::now();
   // Need to get the next frame or error from PopFrame.
@@ -752,13 +742,9 @@ VideoDecoder::RawDecodedOutput VideoDecoder::getDecodedOutputWithFilter(
       StreamInfo& streamInfo = streams_[streamIndex];
       ffmpegStatus =
           avcodec_receive_frame(streamInfo.codecContext.get(), frame.get());
-      VLOG(9) << "received frame" << " status=" << ffmpegStatus
-              << " streamIndex=" << streamInfo.stream->index;
       bool gotNonRetriableError =
           ffmpegStatus != AVSUCCESS && ffmpegStatus != AVERROR(EAGAIN);
       if (gotNonRetriableError) {
-        VLOG(9) << "Got non-retriable error from decoder: "
-                << getFFMPEGErrorStringFromErrorCode(ffmpegStatus);
         gotPermanentErrorOnAnyActiveStream = true;
         break;
       }
@@ -788,7 +774,6 @@ VideoDecoder::RawDecodedOutput VideoDecoder::getDecodedOutputWithFilter(
     UniqueAVPacket packet(av_packet_alloc());
     ffmpegStatus = av_read_frame(formatContext_.get(), packet.get());
     decodeStats_.numPacketsRead++;
-    VLOG(9) << "av_read_frame returned status: " << ffmpegStatus;
     if (ffmpegStatus == AVERROR_EOF) {
       // End of file reached. We must drain all codecs by sending a nullptr
       // packet.
@@ -811,8 +796,6 @@ VideoDecoder::RawDecodedOutput VideoDecoder::getDecodedOutputWithFilter(
           "Could not read frame from input file: " +
           getFFMPEGErrorStringFromErrorCode(ffmpegStatus));
     }
-    VLOG(9) << "Got packet: stream_index=" << packet->stream_index
-            << " pts=" << packet->pts << " size=" << packet->size;
     if (activeStreamIndices_.count(packet->stream_index) == 0) {
       // This packet is not for any of the active streams.
       continue;
@@ -850,10 +833,6 @@ VideoDecoder::RawDecodedOutput VideoDecoder::getDecodedOutputWithFilter(
       std::chrono::duration_cast<std::chrono::milliseconds>(seekDone - start);
   auto seekToDecodeDone = std::chrono::duration_cast<std::chrono::milliseconds>(
       decodeDone - seekDone);
-  VLOG(3) << "Got frame: stream_index=" << activeStream.stream->index
-          << " pts=" << frame->pts << " stats=" << decodeStats_
-          << " startToSeekDone=" << startToSeekDone.count() << "ms"
-          << " seekToDecodeDone=" << seekToDecodeDone.count() << "ms";
   RawDecodedOutput rawOutput;
   rawOutput.streamIndex = frameStreamIndex;
   rawOutput.frame = std::move(frame);
@@ -1021,7 +1000,6 @@ VideoDecoder::DecodedOutput VideoDecoder::getFrameAtIndex(
     int streamIndex,
     int64_t frameIndex,
     std::optional<torch::Tensor> preAllocatedOutputTensor) {
-  std::cerr << "getFrameAtIndex" << std::endl;
   validateUserProvidedStreamIndex(streamIndex);
   validateScannedAllStreams("getFrameAtIndex");
 
@@ -1196,7 +1174,6 @@ VideoDecoder::getFramesDisplayedByTimestampInRange(
 }
 
 VideoDecoder::RawDecodedOutput VideoDecoder::getNextRawDecodedOutputNoDemux() {
-  std::cerr << "getNextRawDecodedOutputNoDemux" << std::endl;
   auto rawOutput =
       getDecodedOutputWithFilter([this](int frameStreamIndex, AVFrame* frame) {
         StreamInfo& activeStream = streams_[frameStreamIndex];
@@ -1207,7 +1184,6 @@ VideoDecoder::RawDecodedOutput VideoDecoder::getNextRawDecodedOutputNoDemux() {
 
 VideoDecoder::DecodedOutput VideoDecoder::getNextDecodedOutputNoDemux(
     std::optional<torch::Tensor> preAllocatedOutputTensor) {
-  std::cerr << "getNextDecodedOutputNoDemux" << std::endl;
   auto rawOutput = getNextRawDecodedOutputNoDemux();
   return convertAVFrameToDecodedOutput(rawOutput, preAllocatedOutputTensor);
 }
diff --git a/src/torchcodec/decoders/_core/VideoDecoderOps.cpp b/src/torchcodec/decoders/_core/VideoDecoderOps.cpp
@@ -9,7 +9,6 @@
 #include <cstdint>
 #include <sstream>
 #include <string>
-#include <iostream>
 #include "c10/core/SymIntArrayRef.h"
 #include "c10/util/Exception.h"
 #include "src/torchcodec/decoders/_core/VideoDecoder.h"
@@ -77,7 +76,6 @@ VideoDecoder* unwrapTensorToGetDecoder(at::Tensor& tensor) {
 }
 
 OpsDecodedOutput makeOpsDecodedOutput(VideoDecoder::DecodedOutput& frame) {
-  std::cerr << "makeOpsDecodedOutput" << std::endl;
   return std::make_tuple(
       frame.frame,
       torch::tensor(frame.ptsSeconds, torch::dtype(torch::kFloat64)),
@@ -215,7 +213,6 @@ OpsDecodedOutput get_frame_at_index(
     at::Tensor& decoder,
     int64_t stream_index,
     int64_t frame_index) {
-  std::cerr << "get_frame_at_index" << std::endl;
   auto videoDecoder = unwrapTensorToGetDecoder(decoder);
   auto result = videoDecoder->getFrameAtIndex(stream_index, frame_index);
   return makeOpsDecodedOutput(result);
@@ -283,12 +280,6 @@ bool _test_frame_pts_equality(
     int64_t frame_index,
     double pts_seconds_to_test) {
   auto videoDecoder = unwrapTensorToGetDecoder(decoder);
-  LOG(INFO) << "pts_seconds_to_test: " << std::setprecision(15)
-            << pts_seconds_to_test << std::endl;
-  LOG(INFO) << "frame pts  : " << std::setprecision(15)
-            << videoDecoder->getPtsSecondsForFrame(stream_index, frame_index)
-            << std::endl
-            << std::endl;
   return pts_seconds_to_test ==
       videoDecoder->getPtsSecondsForFrame(stream_index, frame_index);
 }
