let build tests run in conda

Summary: Much of the code is actually available during the conda tests, as long as we look in the right place. We enable some of them.

Reviewed By: nikhilaravi

Differential Revision: D30249357

fbshipit-source-id: 01c57b6b8c04442237965f23eded594aeb90abfb
This commit is contained in:
Jeremy Reizenstein 2021-08-17 04:25:24 -07:00 committed by Facebook GitHub Bot
parent b0dd0c8821
commit ae1387b523
2 changed files with 21 additions and 14 deletions

View File

@ -29,6 +29,8 @@ def get_pytorch3d_dir() -> Path:
""" """
if os.environ.get("INSIDE_RE_WORKER") is not None: if os.environ.get("INSIDE_RE_WORKER") is not None:
return Path(__file__).resolve().parent return Path(__file__).resolve().parent
elif os.environ.get("CONDA_BUILD_STATE", "") == "TEST":
return Path(os.environ["SRC_DIR"])
else: else:
return Path(__file__).resolve().parent.parent return Path(__file__).resolve().parent.parent

View File

@ -9,22 +9,20 @@ import os
import unittest import unittest
from collections import Counter from collections import Counter
from common_testing import get_pytorch3d_dir, get_tests_dir from common_testing import get_pytorch3d_dir
# This file groups together tests which look at the code without running it. # This file groups together tests which look at the code without running it.
# When running the tests inside conda's build, the code is not available.
in_conda_build = os.environ.get("CONDA_BUILD_STATE", "") == "TEST" in_conda_build = os.environ.get("CONDA_BUILD_STATE", "") == "TEST"
in_re_worker = os.environ.get("INSIDE_RE_WORKER") is not None in_re_worker = os.environ.get("INSIDE_RE_WORKER") is not None
class TestBuild(unittest.TestCase): class TestBuild(unittest.TestCase):
@unittest.skipIf(in_conda_build or in_re_worker, "In conda build, or RE worker") @unittest.skipIf(in_re_worker, "In RE worker")
def test_name_clash(self): def test_name_clash(self):
# For setup.py, all translation units need distinct names, so we # For setup.py, all translation units need distinct names, so we
# cannot have foo.cu and foo.cpp, even in different directories. # cannot have foo.cu and foo.cpp, even in different directories.
test_dir = get_tests_dir() source_dir = get_pytorch3d_dir() / "pytorch3d"
source_dir = test_dir.parent / "pytorch3d"
stems = [] stems = []
for extension in [".cu", ".cpp"]: for extension in [".cu", ".cpp"]:
@ -35,10 +33,9 @@ class TestBuild(unittest.TestCase):
for k, v in counter.items(): for k, v in counter.items():
self.assertEqual(v, 1, f"Too many files with stem {k}.") self.assertEqual(v, 1, f"Too many files with stem {k}.")
@unittest.skipIf(in_conda_build or in_re_worker, "In conda build, or RE worker") @unittest.skipIf(in_re_worker, "In RE worker")
def test_copyright(self): def test_copyright(self):
test_dir = get_tests_dir() root_dir = get_pytorch3d_dir()
root_dir = test_dir.parent
extensions = ("py", "cu", "cuh", "cpp", "h", "hpp", "sh") extensions = ("py", "cu", "cuh", "cpp", "h", "hpp", "sh")
@ -48,11 +45,19 @@ class TestBuild(unittest.TestCase):
for extension in extensions: for extension in extensions:
for path in root_dir.glob(f"**/*.{extension}"): for path in root_dir.glob(f"**/*.{extension}"):
if str(path).endswith( excluded_files = (
"pytorch3d/transforms/external/kornia_angle_axis_to_rotation_matrix.py" "pytorch3d/transforms/external/kornia_angle_axis_to_rotation_matrix.py",
): "pytorch3d/csrc/pulsar/include/fastermath.h",
continue )
if str(path).endswith("pytorch3d/csrc/pulsar/include/fastermath.h"): if in_conda_build:
excluded_files += (
"run_test.py",
"run_test.sh",
"conda_test_runner.sh",
"conda_test_env_vars.sh",
)
if str(path).endswith(excluded_files):
continue continue
with open(path) as f: with open(path) as f:
firstline = f.readline() firstline = f.readline()
@ -64,7 +69,7 @@ class TestBuild(unittest.TestCase):
if len(files_missing_copyright_header) != 0: if len(files_missing_copyright_header) != 0:
self.fail("\n".join(files_missing_copyright_header)) self.fail("\n".join(files_missing_copyright_header))
@unittest.skipIf(in_conda_build or in_re_worker, "In conda build, or RE worker") @unittest.skipIf(in_re_worker, "In RE worker")
def test_valid_ipynbs(self): def test_valid_ipynbs(self):
# Check that the ipython notebooks are valid json # Check that the ipython notebooks are valid json
root_dir = get_pytorch3d_dir() root_dir = get_pytorch3d_dir()