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

Verify Wheel #694

Merged
merged 18 commits into from
Oct 3, 2019
Merged
Show file tree
Hide file tree
Changes from 3 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
28 changes: 9 additions & 19 deletions bindings/py/README.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,23 @@

## Layout of directories:
```
Repository
bindings
REPO_DIR external -- cmake scripts to download/build dependancies
Copy link
Member

Choose a reason for hiding this comment

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

nit, looks like your editor adds weird line ends

Copy link
Member

Choose a reason for hiding this comment

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

@dkeeney please fix these

bindings
py -- Location of Python bindings
packaging -- Contains things needed to build package
cpp_src
bindings -- C++ pybind11 mapping source code
plugin -- C++ code to manage python plugin
tests -- Unit test for python interface
tests -- Unit test for python interface py htm -- python source code goes here tests src htm -- C++ source code goes here examples tests build -- where all things modified by the build are placed (disposible) ThirdParty -- where all thirdParty packages are installed. scripts -- temporary build files Release -- Where things are installed
```

## This is where we build the distribution package:
```
Repository
REPO_DIR
build
scripts --- CMake build artifacts are in here.
Release
bin --- Contains executables for unit tests and examples
include --- Include C++ header files
lib --- Static & Dynamic compiled libraries for htm core found here
distr --- Python distribution (packaging directory copied here)
setup.py
requirements.txt
dist --- pip egg is generated here
htm --- Pure python code is copied to here
src
htm --- Python library assembled here
bindings --- C++ extension libraries installed here
regions
tools
```
bin --- Contains executables for unit tests and examples
include --- Include C++ header files
lib --- Static & Dynamic compiled libraries for htm core found here
- distr ( copy from REPO_DIR/bindings/py/packaging/* by CMake)
/ build -- setup.py; setup() puts stuff in here / dist -- setup.py; setup() puts stuff in here | dummy.c | requirements.txt ( copy from REPO_DIR/requirements.txt by setup.py; setup()) | src --setup.py; setup() will look in here for packages, should find htm, tests | htm ( copy from REPO_DIR/py/htm/* by CMake) | advanced | algorithms | bindings ( copy from REPO_DIR/bindings/py/packaging/bindings/* by CMake) | __init__.py ( copy from REPO_DIR/bindings/py/packaging, by CMake) | *.pyd (the extension libraries from CMake build) | check.py Package used regions to build tools Wheel encoders | examples ( copy from REPO_DIR/bindings/py/packaging/examples/* by CMake) | optimization ( copy form REPO_DIR/py/htm/optimization by CMake) | README.md ( copy form REPO_DIR/py/htm by CMake) | utils_test.py \ tests \ (lots of stuff) ( copy from REPO_DIR/py/tests/* by CMake) - (lots of stuff) ( copy from REPO_DIR/bindings/py/tests/* by CMake) ```
Expand Down
4 changes: 2 additions & 2 deletions bindings/py/cpp_src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ source_group("test" FILES ${src_py_test_files})
# setup the distr directory
set(distr ${CMAKE_INSTALL_PREFIX}/distr)
file(MAKE_DIRECTORY ${distr})
file(COPY ../packaging/. DESTINATION ${distr} PATTERN *)
file(COPY ${REPOSITORY_DIR}/py/. DESTINATION ${distr}/src PATTERN *)
file(COPY "${REPOSITORY_DIR}/bindings/py/packaging/*" DESTINATION ${distr} REGEX ".*__pycache__" EXCLUDE)
file(COPY ${REPOSITORY_DIR}/py/. DESTINATION ${distr}/src REGEX ".*__pycache__" EXCLUDE)

# determine which version of binding to build
if ("${BINDING_BUILD}" STREQUAL "Python2")
Expand Down
Loading