Skip to content

Commit

Permalink
Remove unnecessary parts from pyfans/CmakeLists.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
IshaanDesai committed Nov 4, 2024
1 parent 5d06b1a commit 7e16075
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 10 deletions.
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,7 @@ find_package(MPI REQUIRED)

find_package(FFTW3 REQUIRED COMPONENTS DOUBLE MPI)

if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
set(FANS_LIBRARY_FOR_MICRO_MANAGER_DEFAULT OFF)
endif ()
option(FANS_LIBRARY_FOR_MICRO_MANAGER "Building FANS as a library to be used by the Micro Manager." ${FANS_LIBRARY_FOR_MICRO_MANAGER_DEFAULT})
option(FANS_LIBRARY_FOR_MICRO_MANAGER "Building FANS as a library to be used by the Micro Manager." OFF)

if (FANS_LIBRARY_FOR_MICRO_MANAGER)
include(FetchContent)
Expand Down
6 changes: 0 additions & 6 deletions pyfans/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,3 @@ add_custom_command(
${CMAKE_CURRENT_SOURCE_DIR}/../test/test_pyfans/$<TARGET_FILE_NAME:PyFANS>
COMMENT "Create a symlink for FANS python bindings to ${CMAKE_CURRENT_SOURCE_DIR}/../test/"
)

option(FANS_USE_MPI "Use MPI" OFF)

if (FANS_USE_MPI)
add_definitions(-DFANS_USE_MPI)
endif()
2 changes: 2 additions & 0 deletions pyfans/micro.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ MicroSimulation::MicroSimulation(int sim_id)

py::dict MicroSimulation::solve(py::dict macro_data, double dt)
{
// Time step value dt is not used currently, but is available for future use

// Create a pybind style Numpy array from macro_write_data["micro_vector_data"], which is a Numpy array
py::array_t<double> strain1 = macro_data["strains1to3"].cast<py::array_t<double>>();
py::array_t<double> strain2 = macro_data["strains4to6"].cast<py::array_t<double>>();
Expand Down

0 comments on commit 7e16075

Please sign in to comment.