Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move code to src directory #74

Merged
merged 6 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ assets/ycbineoat/*
**/**.json
**/**.npy
**/**.txt
!src/b3d/renderer/**/**.txt
assets/kitti/*
**/**.pth
2 changes: 1 addition & 1 deletion scripts/make_docs.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pdoc --html b3d --force
pdoc --html src/b3d --force
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
setuptools.setup(
name="b3d",
version="0.0.1",
packages=setuptools.find_packages(),
package_dir={"": "src"},
packages=setuptools.find_packages(where="src"),
package_data={
"b3d": [
"nvdiffrast/common/*.h",
Expand Down Expand Up @@ -61,7 +62,7 @@
"fire==0.6.0",
"torch==2.2.2",
"torchvision==0.17.2",
"jax[cuda12]==0.4.28",
"jax[cuda12]~=0.4.28",
"natsort",
"distinctipy",
"pyliblzfse",
Expand All @@ -79,5 +80,5 @@
"b3d_push = b3d.bucket_utils.b3d_push:upload_to_bucket",
]
},
python_requires=">=3.6",
python_requires=">=3.10",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is true because of genjax, so let's make it true in setup.py...

)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion b3d/utils.py → src/b3d/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@


def get_root_path() -> Path:
return Path(Path(b3d.__file__).parents[1])
return Path(Path(b3d.__file__).parents[2])
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the ONE change that gets the test passing, other than the setup.py changes.



def get_assets() -> Path:
Expand Down