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

Build strelka on osx #52208

Closed
wants to merge 1 commit into from
Closed

Build strelka on osx #52208

wants to merge 1 commit into from

Conversation

mencian
Copy link
Contributor

@mencian mencian commented Nov 19, 2024

Describe your pull request here


Please read the guidelines for Bioconda recipes before opening a pull request (PR).

General instructions

  • If this PR adds or updates a recipe, use "Add" or "Update" appropriately as the first word in its title.
  • New recipes not directly relevant to the biological sciences need to be submitted to the conda-forge channel instead of Bioconda.
  • PRs require reviews prior to being merged. Once your PR is passing tests and ready to be merged, please issue the @BiocondaBot please add label command.
  • Please post questions on Gitter or ping @bioconda/core in a comment.

Instructions for avoiding API, ABI, and CLI breakage issues

Conda is able to record and lock (a.k.a. pin) dependency versions used at build time of other recipes.
This way, one can avoid that expectations of a downstream recipe with regards to API, ABI, or CLI are violated by later changes in the recipe.
If not already present in the meta.yaml, make sure to specify run_exports (see here for the rationale and comprehensive explanation).
Add a run_exports section like this:

build:
  run_exports:
    - ...

with ... being one of:

Case run_exports statement
semantic versioning {{ pin_subpackage("myrecipe", max_pin="x") }}
semantic versioning (0.x.x) {{ pin_subpackage("myrecipe", max_pin="x.x") }}
known breakage in minor versions {{ pin_subpackage("myrecipe", max_pin="x.x") }} (in such a case, please add a note that shortly mentions your evidence for that)
known breakage in patch versions {{ pin_subpackage("myrecipe", max_pin="x.x.x") }} (in such a case, please add a note that shortly mentions your evidence for that)
calendar versioning {{ pin_subpackage("myrecipe", max_pin=None) }}

while replacing "myrecipe" with either name if a name|lower variable is defined in your recipe or with the lowercase name of the package in quotes.

Bot commands for PR management

Please use the following BiocondaBot commands:

Everyone has access to the following BiocondaBot commands, which can be given in a comment:

@BiocondaBot please update Merge the master branch into a PR.
@BiocondaBot please add label Add the please review & merge label.
@BiocondaBot please fetch artifacts Post links to CI-built packages/containers.
You can use this to test packages locally.

Note that the @BiocondaBot please merge command is now depreciated. Please just squash and merge instead.

Also, the bot watches for comments from non-members that include @bioconda/<team> and will automatically re-post them to notify the addressed <team>.

Copy link
Contributor

coderabbitai bot commented Nov 19, 2024

📝 Walkthrough

Walkthrough

The changes in this pull request involve modifications to the configuration and build process of the strelka package. The boost.cmake file has been updated to adjust Boost library parameters, setting Boost_USE_STATIC_LIBS to OFF, enabling multithreading with Boost_USE_MULTITHREADED set to TRUE, and activating debug output with Boost_DEBUG set to ON. The build.sh script has been significantly revised to eliminate manual copying and configuration, instead utilizing environment variables for compilation and implementing a CMake-based build process. It includes OS-specific configurations for macOS and updates the symbolic link creation command. The meta.yaml file has also been altered, with updates to the package name, checksum, build number, dependencies, and additional fields for documentation and platform support. These changes collectively enhance the build and configuration process for the strelka package, particularly in relation to Boost library integration.

Possibly related PRs

Suggested labels

osx-arm64

Suggested reviewers

  • bgruening

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 3

🧹 Outside diff range and nitpick comments (4)
recipes/strelka/meta.yaml (1)

21-31: Consider tightening Python version constraint

While python <3 works, it might be better to specify a more precise version range like python >=2.7,<3 to ensure compatibility with older Python 2.7 versions.

  run:
-    - python <3
+    - python >=2.7,<3
     - boost-cpp
recipes/strelka/build.sh (3)

8-11: Initialize compiler flags to prevent leading spaces

If LDFLAGS or CXXFLAGS are not set in the environment, the exported variables may begin with a leading space, which could cause issues in some build systems. Initialize them to empty strings if they're unset to avoid potential problems.

Apply the following changes:

-export LDFLAGS="${LDFLAGS} -L${PREFIX}/lib"
-export CXXFLAGS="${CXXFLAGS} -O3 -I${PREFIX}/include"
+export LDFLAGS="${LDFLAGS:-} -L${PREFIX}/lib"
+export CXXFLAGS="${CXXFLAGS:-} -O3 -I${PREFIX}/include"

13-13: Use $(...) instead of backticks for command substitution

For improved readability and to follow modern Bash best practices, consider using $(...) instead of backticks `...` for command substitution.

Apply this change:

-if [[ `uname` == "Darwin" ]]; then
+if [[ $(uname) == "Darwin" ]]; then

26-33: Remove obsolete commented-out code to enhance maintainability

The code between lines 26 and 33 is commented out and no longer in use. Removing obsolete code helps keep the script clean and maintainable.

Apply this change:

-#cp -r bin lib libexec share $outdir
-#sed -i.bak \
-#    -e "s~scriptDir=.*~scriptDir='$outdir/bin'~" \
-#    -e "s~workflowDir=.*~workflowDir='$outdir/lib/python'~" \
-#    $outdir/bin/configure*.py
-#sed -i.bak \
-#    -e "s~scriptDir=.*~scriptDir='$outdir/bin'~" \
-#    $outdir/bin/run*.bash
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 892854c and 35593f1.

📒 Files selected for processing (3)
  • recipes/strelka/boost.cmake.patch (1 hunks)
  • recipes/strelka/build.sh (1 hunks)
  • recipes/strelka/meta.yaml (1 hunks)
🧰 Additional context used
🪛 yamllint
recipes/strelka/meta.yaml

[error] 1-1: syntax error: found character '%' that cannot start any token

(syntax)

🔇 Additional comments (6)
recipes/strelka/boost.cmake.patch (1)

1-24: Verify OSX compatibility with these changes

While disabling static linking (Boost_USE_STATIC_LIBS OFF) is a good step for OSX compatibility, we should verify that these CMake changes work correctly on OSX.

✅ Verification successful

Boost configuration changes are appropriate for OSX compatibility

The changes in the patch are well-aligned with OSX build requirements:

  • Disabling static linking (Boost_USE_STATIC_LIBS OFF) is the correct approach for OSX compatibility
  • Adding explicit include and link directory handling via include_directories(${Boost_INCLUDE_DIRS}) and LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) provides proper library resolution
  • The multithreaded setting (Boost_USE_MULTITHREADED TRUE) is compatible with OSX's threading model

The lack of conflicting OSX-specific Boost configurations in the codebase suggests these changes won't interfere with existing platform-specific handling.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for any OSX-specific Boost configurations or known issues
# that might affect the build.

# Search for any OSX-specific Boost configurations
rg -l "darwin|apple|osx" --type cmake

# Look for existing Boost configurations that might conflict
ast-grep --pattern 'set.*Boost_USE_STATIC_LIBS'

Length of output: 89


Script:

#!/bin/bash
# Let's try a broader search to understand the build system configuration

# Check for platform-specific handling in CMake files
rg -A 5 -B 5 "IF.*APPLE|IF.*Darwin|APPLE|Darwin" --type cmake

# Look for any Boost-related configurations
rg -A 3 "Boost_" --type cmake

# Check if there are any other patches or configuration files for OSX
fd -e patch -e cmake -x grep -l "darwin|apple|osx|boost" {}

Length of output: 833

recipes/strelka/meta.yaml (5)

1-3: LGTM! Good use of Jinja2 variables

The package metadata is well-structured using Jinja2 variables, making it easier to maintain and update.

🧰 Tools
🪛 yamllint

[error] 1-1: syntax error: found character '%' that cannot start any token

(syntax)


16-18: LGTM! Good ABI compatibility practice

The run_exports section with pin_subpackage helps prevent ABI breakage, which aligns with the PR objectives.


39-45: LGTM! Well-documented metadata

The metadata section is complete with proper license information and helpful URLs for documentation and development.


49-55: LGTM! Good platform coverage and identifiers

The addition of arm64 platforms and comprehensive identifiers enhances the package's discoverability and platform support. The inclusion of osx-arm64 aligns well with the PR's objective of OSX support.


10-13: Verify the boost.cmake patch file

The patch file is crucial for OSX support. Let's verify its existence and contents.

✅ Verification successful

Patch file verified and contains appropriate Boost configuration changes

The patch file exists and modifies src/cmake/boost.cmake with necessary changes for OSX compatibility:

  • Disables static linking (Boost_USE_STATIC_LIBS OFF)
  • Enables multi-threading support
  • Adds debug mode
  • Includes proper directory linking
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the patch file exists and examine its contents
# Expected: Find the patch file and see Boost-related configurations

# Check if patch file exists
if [ -f "recipes/strelka/boost.cmake.patch" ]; then
    echo "Patch file found"
    cat recipes/strelka/boost.cmake.patch
else
    echo "ERROR: Patch file missing"
fi

Length of output: 1199

Comment on lines +9 to +12
- set (Boost_USE_STATIC_LIBS ON)
+ set( Boost_USE_STATIC_LIBS OFF )
+ set( Boost_USE_MULTITHREADED TRUE )
+ set( Boost_DEBUG ON )
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Review multithreaded configuration and debug settings

There are several concerns with the current configuration:

  1. There's a conflict in multithreaded settings:

    • Line 11 sets Boost_USE_MULTITHREADED TRUE globally
    • Line 15 sets it OFF for non-Windows platforms
      This contradiction needs to be resolved.
  2. Boost_DEBUG ON should typically be disabled in production builds as it may impact build performance.

Consider the following changes:

-    set( Boost_USE_STATIC_LIBS OFF )
-    set( Boost_USE_MULTITHREADED TRUE )
-    set( Boost_DEBUG ON )
+    set(Boost_USE_STATIC_LIBS OFF)
+    # Only enable multithreading for Windows
+    if (WIN32)
+        set(Boost_USE_MULTITHREADED TRUE)
+    else()
+        set(Boost_USE_MULTITHREADED OFF)
+    endif()
+    # Enable debug only for development/testing
+    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+        set(Boost_DEBUG ON)
+    endif()

Also applies to: 15-15

Comment on lines +20 to +21
+ include_directories(${Boost_INCLUDE_DIRS})
+ LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Use modern CMake target-based approach

The current global include and link directory modifications don't follow modern CMake best practices. These commands affect all targets in scope and may cause unnecessary dependencies.

Consider using target-specific commands instead:

-    include_directories(${Boost_INCLUDE_DIRS})
-    LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+    # Create an interface library for Boost dependencies
+    add_library(boost_deps INTERFACE)
+    target_include_directories(boost_deps INTERFACE ${Boost_INCLUDE_DIRS})
+    target_link_libraries(boost_deps INTERFACE ${Boost_LIBRARIES})
+    
+    # Link against specific targets that need Boost
+    target_link_libraries(your_target PRIVATE boost_deps)

Committable suggestion skipped: line range outside the PR's diff.

#sed -i.bak \
# -e "s~scriptDir=.*~scriptDir='$outdir/bin'~" \
# $outdir/bin/run*.bash
ln -sf $outdir/bin/config*.py $outdir/bin/run*.bash $PREFIX/bin
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Ensure glob patterns match existing files to prevent errors

If the glob patterns config*.py or run*.bash do not match any files, the ln command may create unintended symlinks or fail. To prevent this, check if the files exist before creating the symlinks.

Modify the command as follows:

# Create symlinks only if matching files exist
for file in $outdir/bin/config*.py $outdir/bin/run*.bash; do
    if [[ -e "$file" ]]; then
        ln -sf "$file" "$PREFIX/bin"
    fi
done

@mencian mencian closed this Nov 19, 2024
@mencian mencian deleted the strelka branch November 19, 2024 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant